File l4env-DESTDIR.patch of Package tud-l4env
Index: l4/Makefile =================================================================== --- l4.orig/Makefile +++ l4/Makefile @@ -115,7 +115,7 @@ clean cleanall install:: install:: l4defs -L4DEF_FILE ?= $(DROPS_STDDIR)/l4defs.inc +L4DEF_FILE ?= $(DESTDIR)$(DROPS_STDDIR)/l4defs.inc l4defs: $(L4DEF_FILE) Index: l4/doc/dev-overview/Makefile =================================================================== --- l4.orig/doc/dev-overview/Makefile +++ l4/doc/dev-overview/Makefile @@ -49,10 +49,10 @@ cleanall:: clean $(VERBOSE)rm -rf $(OBJ_BASE)/doc/html/$(TITLE) $(OBJ_BASE)/doc/html/$(PKGNAME) install:: all - $(VERBOSE)install -d $(DROPS_STDDIR)/doc/html/$(PKGNAME) - $(VERBOSE)install -m 0644 $(PDFFILES) $(DROPS_STDDIR)/doc/html/$(PKGNAME)/ - $(VERBOSE)install -m 0644 $(HTMLFILES) $(DROPS_STDDIR)/doc/html/$(PKGNAME)/index.html - $(VERBOSE)install -m 0644 $(TITLE) $(DROPS_STDDIR)/doc/html/ + $(VERBOSE)install -d $(DESTDIR)$(DROPS_STDDIR)/doc/html/$(PKGNAME) + $(VERBOSE)install -m 0644 $(PDFFILES) $(DESTDIR)$(DROPS_STDDIR)/doc/html/$(PKGNAME)/ + $(VERBOSE)install -m 0644 $(HTMLFILES) $(DESTDIR)$(DROPS_STDDIR)/doc/html/$(PKGNAME)/index.html + $(VERBOSE)install -m 0644 $(TITLE) $(DESTDIR)$(DROPS_STDDIR)/doc/html/ $(TITLE): $(VERBOSE)echo -en "guide\nDeveloping with L4 -- Overview and Pointers" > $(PKGNAME).title Index: l4/mk/doc.mk =================================================================== --- l4.orig/mk/doc.mk +++ l4/mk/doc.mk @@ -110,7 +110,7 @@ $(OBJ_DIR)/% $(OBJ_DIR)/%/html:$(SRC_DIR # define LOCAL_INSTALLDIR prior to including install.inc, where the install- # rules are defined. Same for INSTALLDIR. INSTALLDIR_HTML ?= $(DROPS_STDDIR)/doc/html -INSTALLFILE_HTML ?= $(CP) -ap $(1) $(2) +INSTALLFILE_HTML ?= $(CP) -ap $(1) $(DESTDIR)$(2) INSTALLDIR_HTML_LOCAL ?= $(OBJ_BASE)/doc/html INSTALLFILE_HTML_LOCAL ?= for f in $(wildcard $(call absfilename,$(1))); do $(LN) -sf $$f $(2); done @@ -154,7 +154,7 @@ $(foreach f,$(INSTALL_TARGET_DOX),$(INST # Install the docu globally, the title file will depend on $(foreach f,$(INSTALL_TARGET_DOX),$(INSTALLDIR)/$(f)):$(INSTALLDIR)/%:$(OBJ_DIR)/% $(OBJ_DIR)/%/html @$(INSTALL_DOC_MESSAGE) - $(if $(INSTALLFILE),$(VERBOSE)$(INSTALL) -d $@) + $(if $(INSTALLFILE),$(VERBOSE)$(INSTALL) -d $(DESTDIR)$@) $(VERBOSE)$(call INSTALLFILE,$</html/*,$@) install:: $(addprefix $(INSTALLDIR)/,$(addsuffix .title,$(INSTALL_TARGET_DOX))) Index: l4/mk/idl.mk =================================================================== --- l4.orig/mk/idl.mk +++ l4/mk/idl.mk @@ -26,7 +26,7 @@ DICE_REQ := --require="3.2.0" # rules are defined. Same for INSTALLDIR. INSTALLDIR_IDL ?= $(DROPS_STDDIR)/include/$(ARCH)/$(L4API)/$(INSTALL_INC_PREFIX) INSTALLDIR_IDL_LOCAL ?= $(OBJ_BASE)/include/$(ARCH)/$(L4API)/$(INSTALL_INC_PREFIX) -INSTALLFILE_IDL ?= $(INSTALL) -m 644 $(1) $(2) +INSTALLFILE_IDL ?= $(INSTALL) -m 644 $(1) $(DESTDIR)$(2) INSTALLFILE_IDL_LOCAL ?= $(LN) -sf $(call absfilename,$(1)) $(2) INSTALLFILE = $(INSTALLFILE_IDL) Index: l4/mk/include.mk =================================================================== --- l4.orig/mk/include.mk +++ l4/mk/include.mk @@ -19,7 +19,7 @@ # relink - reinstall locally -INSTALLDIR_INC ?= $(DROPS_STDDIR)/include +INSTALLDIR_INC ?= $(DESTDIR)$(DROPS_STDDIR)/include INSTALLDIR_INC_LOCAL ?= $(OBJ_BASE)/include INSTALLDIR = $(INSTALLDIR_INC) Index: l4/mk/install.inc =================================================================== --- l4.orig/mk/install.inc +++ l4/mk/install.inc @@ -56,7 +56,7 @@ endif $(foreach f,$(INSTALL_TARGET),$(INSTALLDIR)/$(f)):$(INSTALLDIR)/%:% @$(INSTALL_MESSAGE) - $(if $(INSTALLFILE),$(VERBOSE)$(INSTALL) -d $(dir $@)) + $(if $(INSTALLFILE),$(VERBOSE)$(INSTALL) -d $(addprefix $(DESTDIR),$(dir $@))) $(VERBOSE)$(call INSTALLFILE,$<,$@) # unconditionally install on "make install" Index: l4/mk/lib.mk =================================================================== --- l4.orig/mk/lib.mk +++ l4/mk/lib.mk @@ -21,7 +21,7 @@ ROLE = lib.mk # rules are defined. Same for INSTALLDIR. INSTALLDIR_LIB ?= $(DROPS_STDDIR)/lib/$(subst -,/,$(SYSTEM)) INSTALLDIR_LIB_LOCAL ?= $(OBJ_BASE)/lib/$(subst -,/,$(SYSTEM)) -INSTALLFILE_LIB ?= $(INSTALL) -m 644 $(1) $(2) +INSTALLFILE_LIB ?= $(INSTALL) -m 644 $(1) $(DESTDIR)$(2) INSTALLFILE_LIB_LOCAL ?= $(LN) -sf $(call absfilename,$(1)) $(2) INSTALLFILE = $(INSTALLFILE_LIB) Index: l4/mk/prog.mk =================================================================== --- l4.orig/mk/prog.mk +++ l4/mk/prog.mk @@ -35,7 +35,7 @@ INSTALLFILE_BIN ?= $(STRIP) --strip-unn INSTALLFILE_BIN_LOCAL ?= $(STRIP) --strip-unneeded $(1) -o $(2) && \ chmod 755 $(2) else -INSTALLFILE_BIN ?= $(INSTALL) -m 755 $(1) $(2) +INSTALLFILE_BIN ?= $(INSTALL) -m 755 $(1) $(DESTDIR)$(2) INSTALLFILE_BIN_LOCAL ?= $(INSTALL) -m 755 $(1) $(2) endif Index: l4/pkg/Makefile =================================================================== --- l4.orig/pkg/Makefile +++ l4/pkg/Makefile @@ -214,7 +214,7 @@ $(addsuffix .headers,$(BUILD_SUBDIRS)):% install:: $(VERBOSE)set -e; for i in $(BUILD_SUBDIRS); do \ $(call INST_MESSAGE,$(BID_DOLLARQUOTE)$$i); \ - PWD=$(PWD)/$$i $(MAKE) -C $$i $@; \ + PWD=$(PWD)/$$i $(MAKE) -C $$i DESTDIR=$(DESTDIR) $@; \ done doc: Index: l4/pkg/ldso/examples/simple/libsimple1_dyn/Makefile =================================================================== --- l4.orig/pkg/ldso/examples/simple/libsimple1_dyn/Makefile +++ l4/pkg/ldso/examples/simple/libsimple1_dyn/Makefile @@ -13,7 +13,7 @@ ifneq ($(SYSTEM),) # additionally to linking TARGET to $(L4DIR)/lib (needed for linking at # build time), copy TARGET to the binary directory (needed for linking at # runtime) -BINTARGET ?= $(DROPS_STDDIR)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) +BINTARGET ?= $(DESTDIR)$(DROPS_STDDIR)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) BINTARGET_LOCAL ?= $(OBJ_BASE)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) INSTALLFILE_BIN_LOCAL ?= cp $(1) $(2) && chmod 644 $(2) Index: l4/pkg/ldso/examples/simple/libsimple2_dyn/Makefile =================================================================== --- l4.orig/pkg/ldso/examples/simple/libsimple2_dyn/Makefile +++ l4/pkg/ldso/examples/simple/libsimple2_dyn/Makefile @@ -12,7 +12,7 @@ ifneq ($(SYSTEM),) # additionally to linking TARGET to $(L4DIR)/lib (needed for linking at # build time), copy TARGET to the binary directory (needed for linking at # runtime) -BINTARGET ?= $(DROPS_STDDIR)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) +BINTARGET ?= $(DESTDIR)$(DROPS_STDDIR)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) BINTARGET_LOCAL ?= $(OBJ_BASE)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) INSTALLFILE_BIN_LOCAL ?= cp $(1) $(2) && chmod 644 $(2) Index: l4/pkg/ldso/lib/ldso/Makefile =================================================================== --- l4.orig/pkg/ldso/lib/ldso/Makefile +++ l4/pkg/ldso/lib/ldso/Makefile @@ -71,7 +71,7 @@ ifneq ($(SYSTEM),) # additionally to linking TARGET to $(L4DIR)/lib (needed for linking at # build time), copy TARGET to the binary directory (needed for linking at # runtime) -BINDIR ?= $(DROPS_STDDIR)/bin/$(subst -,/,$(SYSTEM)) +BINDIR ?= $(DESTDIR)$(DROPS_STDDIR)/bin/$(subst -,/,$(SYSTEM)) BINDIR_LOCAL ?= $(OBJ_BASE)/bin/$(subst -,/,$(SYSTEM)) INSTALLFILE_BIN_LOCAL ?= cp $(1) $(2) && chmod 644 $(2) Index: l4/pkg/ldso/lib/libdl/Makefile =================================================================== --- l4.orig/pkg/ldso/lib/libdl/Makefile +++ l4/pkg/ldso/lib/libdl/Makefile @@ -33,7 +33,7 @@ DEBUG ?= 0 include $(L4DIR)/mk/lib.mk ifneq ($(SYSTEM),) -BINTARGET ?= $(DROPS_STDDIR)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) +BINTARGET ?= $(DESTDIR)$(DROPS_STDDIR)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) BINTARGET_LOCAL ?= $(OBJ_BASE)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) INSTALLFILE_BIN_LOCAL ?= cp $(1) $(2) && chmod 644 $(2) Index: l4/pkg/loader/lib/runtime/Makefile =================================================================== --- l4.orig/pkg/loader/lib/runtime/Makefile +++ l4/pkg/loader/lib/runtime/Makefile @@ -64,7 +64,7 @@ ifneq ($(SYSTEM),) # additionally to linking TARGET to $(L4DIR)/lib (needed for linking at # build time), copy TARGET to the binary directory (needed for linking at # runtime) -BINTARGET ?= $(DROPS_STDDIR)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) +BINTARGET ?= $(DESTDIR)$(DROPS_STDDIR)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) BINTARGET_LOCAL ?= $(OBJ_BASE)/bin/$(subst -,/,$(SYSTEM)/$(TARGET)) INSTALLFILE_BIN_LOCAL ?= cp $(1) $(2) && chmod 644 $(2) Index: l4/tool/config/Makefile =================================================================== --- l4.orig/tool/config/Makefile +++ l4/tool/config/Makefile @@ -2,7 +2,7 @@ L4DIR ?= ../.. DIALOG = lxdialog DIALOGDIR = lxdialog -INSTALLDIR = $(DROPS_STDDIR)/tool/bin +INSTALLDIR = $(DESTDIR)$(DROPS_STDDIR)/tool/bin all install:: $(DIALOGDIR)/$(DIALOG) Index: l4/tool/gendep/Makefile =================================================================== --- l4.orig/tool/gendep/Makefile +++ l4/tool/gendep/Makefile @@ -35,10 +35,10 @@ $(MAN): $(MAN_SRC) install:: $(LIB) $(MAN) $(if $(DROPS_STDDIR),,$(error DROPS_STDDIR is not set. Do a 'make config' in $(L4DIR))) - $(VERBOSE)install -d $(DROPS_STDDIR)/tool/lib - $(VERBOSE)install -c $(LIB) $(DROPS_STDDIR)/tool/lib - $(VERBOSE)install -d $(DROPS_STDDIR)/tool/man/man7 - $(VERBOSE)install -c $(MAN) $(DROPS_STDDIR)/tool/man/man7 + $(VERBOSE)install -d $(DESTDIR)$(DROPS_STDDIR)/tool/lib + $(VERBOSE)install -c $(LIB) $(DESTDIR)$(DROPS_STDDIR)/tool/lib + $(VERBOSE)install -d $(DESTDIR)$(DROPS_STDDIR)/tool/man/man7 + $(VERBOSE)install -c $(MAN) $(DESTDIR)$(DROPS_STDDIR)/tool/man/man7 test: GENDEP_TARGET='simple-cat' \
