Skip to content

build: Makefile and specfile tweaks #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashcrow merged 1 commit into from
Jan 17, 2019
Merged

build: Makefile and specfile tweaks #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ DEFAULT_TEMPLATE := /etc/image-helpgen/template.tpl
# Used during all builds
LDFLAGS := -X main.version=${VERSION} -X main.commitHash=${COMMIT_HASH} -X main.buildTime=${BUILD_TIME}

PREFIX ?= /usr
CONFIG_DIR ?= /etc
BIN_DIR ?= /usr/bin
BIN_DIR ?= ${PREFIX}/bin

.PHONY: help build clean deps install lint static test

Expand Down Expand Up @@ -46,8 +47,8 @@ deps:
dep ensure -v

install: clean build
install -d ${PREFIX}${BIN_DIR}
install --mode 755 pivot ${PREFIX}${BIN_DIR}/pivot
install -d ${DESTDIR}${BIN_DIR}
install --mode 755 pivot ${DESTDIR}${BIN_DIR}/pivot

lint:
go get -u github.com/golang/lint/golint
Expand Down
5 changes: 2 additions & 3 deletions pivot.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ cd src/github.com/openshift/%{name}/
make build

%install
ls -la
install -d %{buildroot}%{_bindir}
install --mode 755 src/github.com/openshift/%{name}/%{name} %{buildroot}%{_bindir}/%{name}
cd src/github.com/openshift/%{name}/
make install DESTDIR=%{buildroot}

%files
%license LICENSE
Expand Down