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

Makefile.inc, rules.real: Fix conflation of $(DESTDIR) and $(prefix)

This commit is contained in:
Ben Hutchings 2016-02-22 23:39:54 +00:00
parent 9d68385e9d
commit 014aa49511
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ linux-tools (4.5~rc5-1~exp4) UNRELEASED; urgency=medium
* Makefile.inc: Add support for wildcards in $(SCRIPTS) and $(DATA)
* linux-kbuild: Include scripts/Makefile.* (Closes: #815593)
* Makefile.inc, rules.real: Fix conflation of $(DESTDIR) and $(prefix)
-- Ben Hutchings <ben@decadent.org.uk> Mon, 22 Feb 2016 23:21:57 +0000

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

@ -32,23 +32,23 @@ install-local: install-local-progs install-local-scripts install-local-data
install-local-progs: $(PROGS)
@for p in $^; do \
echo " install -m755 '$$p' '$(prefix)/$(OUTDIR)'"; \
install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
echo " install -m755 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
done
SCRIPTS_REAL = $(wildcard $(addprefix $(top_srcdir)/$(OUTDIR)/,$(SCRIPTS)))
install-local-scripts: $(SCRIPTS_REAL)
@for p in $^; do \
echo " install -m755 '$$p' '$(prefix)/$(OUTDIR)'"; \
install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
echo " install -m755 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
done
DATA_REAL = $(wildcard $(addprefix $(top_srcdir)/$(OUTDIR)/,$(DATA)))
install-local-data: $(DATA_REAL)
@for p in $^; do \
echo " install -m644 '$$p' '$(prefix)/$(OUTDIR)'"; \
install -D -m644 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
echo " install -m644 '$$p' '$(DESTDIR)/$(prefix)/$(OUTDIR)'"; \
install -D -m644 "$$p" "$(DESTDIR)/$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
done

8
debian/rules.real vendored
View File

@ -28,14 +28,14 @@ $(STAMPS_DIR)/build:
install-kbuild: PACKAGE_NAME = linux-kbuild-$(VERSION)
install-kbuild: DH_OPTIONS = -p$(PACKAGE_NAME)
install-kbuild: BASE_DIR = /usr/lib/$(PACKAGE_NAME)
install-kbuild: DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
install-kbuild: PREFIX_DIR = /usr/lib/$(PACKAGE_NAME)
install-kbuild: DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
install-kbuild: $(STAMPS_DIR)/build
dh_testdir
dh_testroot
dh_prep
$(call submake,scripts) install prefix=$(DIR)
dh_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME)
$(call submake,scripts) install DESTDIR=$(DIR) prefix=$(PREFIX_DIR)
dh_link $(PREFIX_DIR) /usr/src/$(PACKAGE_NAME)
dh_installchangelogs
dh_installdocs
dh_strip