diff --git a/ChangeLog b/ChangeLog index a078f1a..fc06681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2006-11-15 Nicola Pero + + Notice: you should now use 'make DESTDIR=/tmp/xxx install' if you + want to relocate all the installation into /tmp/xxx/ + + * Makefile.postamble: Use DESTDIR everywhere instead of + INSTALL_ROOT_DIR. + * GNUmakefile: Do set GNUSTEP_INSTALLATION_DIR. + * GSWeb.framework/GNUmakefile: Same change. + * GSWExtensions.framework/GNUmakefile: Same change. + * GSWExtensionsGSW.framework/GNUmakefile: Same change. + * Examples/hello/GNUmakefile: Same change. + + 2006-10-04 David Ayers * GSWeb.framework/GSWDefaultAdaptorThread.m diff --git a/Examples/hello/GNUmakefile b/Examples/hello/GNUmakefile index 2247139..5c70b94 100644 --- a/Examples/hello/GNUmakefile +++ b/Examples/hello/GNUmakefile @@ -22,9 +22,6 @@ # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# Install into the system root by default -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) - include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make diff --git a/GNUmakefile b/GNUmakefile index 2bf7bc9..5220a9d 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -22,8 +22,6 @@ # License along with this library; if not, write to the Free # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) - include $(GNUSTEP_MAKEFILES)/common.make include ./Version diff --git a/GSWExtensions.framework/GNUmakefile b/GSWExtensions.framework/GNUmakefile index 84ed7c1..3ba56b2 100644 --- a/GSWExtensions.framework/GNUmakefile +++ b/GSWExtensions.framework/GNUmakefile @@ -20,9 +20,6 @@ # License along with this library; if not, write to the Free # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# Install into the system root by default -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) - include $(GNUSTEP_MAKEFILES)/common.make include ../Version diff --git a/GSWExtensionsGSW.framework/GNUmakefile b/GSWExtensionsGSW.framework/GNUmakefile index afec369..d5451e3 100644 --- a/GSWExtensionsGSW.framework/GNUmakefile +++ b/GSWExtensionsGSW.framework/GNUmakefile @@ -20,9 +20,6 @@ # License along with this library; if not, write to the Free # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# Install into the system root by default -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) - include $(GNUSTEP_MAKEFILES)/common.make include ../Version diff --git a/GSWeb.framework/GNUmakefile b/GSWeb.framework/GNUmakefile index 65d78a6..2fe5cfc 100644 --- a/GSWeb.framework/GNUmakefile +++ b/GSWeb.framework/GNUmakefile @@ -21,9 +21,6 @@ # License along with this library; if not, write to the Free # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# Install into the system root by default -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) - GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gsweb.make include $(GNUSTEP_MAKEFILES)/common.make ifeq ($(GDL2),yes) @@ -47,10 +44,10 @@ FRAMEWORK_NAME = GSWeb WebObjects endif # Ensure that each framework uses its own GNUSTEP_OBJ_DIR_NAME & DERIVED_SRC -ifneq ($(GNUSTEP_INSTANCE),) -GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME)/$(GNUSTEP_INSTANCE) -DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE) -endif +#ifneq ($(GNUSTEP_INSTANCE),) +#GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME)/$(GNUSTEP_INSTANCE) +#DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE) +#endif WebObjects_CPPFLAGS = -DGSWEB_WONAMES diff --git a/Makefile.postamble b/Makefile.postamble index dcc929c..20a6626 100644 --- a/Makefile.postamble +++ b/Makefile.postamble @@ -46,15 +46,15 @@ gsdocs: # The following rule is important mainly for packaging, because in that case # you install into a fake system tree, and the directory is not there. # -$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary: +$(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary: $(MKINSTALLDIRS) $@ # Things to do before installing -before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary +before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary $(INSTALL_DATA) gsweb.make \ - $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make + $(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make $(INSTALL_DATA) gsweb_wo.make \ - $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb_wo.make + $(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb_wo.make # Things to do after installing #after-install:: @@ -64,8 +64,8 @@ before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary # Things to do after uninstalling after-uninstall:: - rm -f $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make - rm -f $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb_wo.make + rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make + rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb_wo.make # Things to do before cleaning # before-clean::