debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Fix setting of installation directory for tools/hv 

Add installdir variable that defaults to $(prefix)/$(OUTDIR) as used
in scripts/, but can be set directly in tools/hv which doesn't want
to mirror the source hierarchy.
This commit is contained in:
Ben Hutchings 2016-02-23 00:54:38 +00:00
parent 910e14869d
commit a5f3e6ab8c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/rules.d/Makefile.inc vendored
View File

@ -14,6 +14,8 @@ CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) \
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -Wall
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
installdir ?= $(prefix)/$(OUTDIR)
all: all-local all-recursive
clean: clean-recursive
install: install-local install-recursive
@ -32,23 +34,23 @@ install-local: install-local-progs install-local-scripts install-local-data
install-local-progs: $(PROGS)
@for p in $^; do \
echo " install -m755 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
echo " install -m755 '$$p' '$(DESTDIR)/$(installdir)'"; \
install -D -m755 "$$p" "$(DESTDIR)/$(installdir)/$$(basename $$p)"; \
done
SCRIPTS_REAL = $(wildcard $(addprefix $(top_srcdir)/$(OUTDIR)/,$(SCRIPTS)))
install-local-scripts: $(SCRIPTS_REAL)
@for p in $^; do \
echo " install -m755 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
echo " install -m755 '$$p' '$(DESTDIR)/$(installdir)'"; \
install -D -m755 "$$p" "$(DESTDIR)/$(installdir)/$$(basename $$p)"; \
done
DATA_REAL = $(wildcard $(addprefix $(top_srcdir)/$(OUTDIR)/,$(DATA)))
install-local-data: $(DATA_REAL)
@for p in $^; do \
echo " install -m644 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
install -D -m644 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
echo " install -m644 '$$p' '$(DESTDIR)/$(installdir)'"; \
install -D -m644 "$$p" "$(DESTDIR)/$(installdir)/$$(basename $$p)"; \
done

2
debian/rules.d/tools/hv/Makefile vendored
View File

@ -10,7 +10,7 @@ PROGS = \
hv_kvp_daemon \
hv_vss_daemon
prefix = /usr/sbin
installdir = /usr/sbin
include $(top_rulesdir)/Makefile.inc