From e708ccb6e6c864a39d8410c217b0a8766fb55321 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Wed, 15 Nov 2006 17:06:17 +0000 Subject: [PATCH] Use GNUSTEP_INSTALLATION_DOMAIN instead of GNUSTEP_INSTALLATION_DIR, and DESTDIR instead of INSTALL_ROOT_DIR git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@24095 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 22 ++++++++++++++++++++++ Documentation/Back/GNUmakefile | 2 +- Documentation/GNUmakefile | 2 +- Fonts/GNUmakefile | 2 +- GNUmakefile.postamble | 8 ++++---- Source/GNUmakefile | 2 +- Source/art/GNUmakefile | 2 +- Source/cairo/GNUmakefile | 2 +- Source/gsc/GNUmakefile | 2 +- Source/win32/GNUmakefile | 2 +- Source/winlib/GNUmakefile | 2 +- Source/x11/GNUmakefile | 2 +- Source/xdps/GNUmakefile | 2 +- Source/xlib/GNUmakefile | 2 +- Tools/GNUmakefile | 2 +- 15 files changed, 39 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba55a88..f06948a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +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/ + * GNUmakefile.postamble: Use DESTDIR instead of INSTALL_ROOT_DIR + everywhere. + + * Documentation/Back/GNUmakefile: Use GNUSTEP_INSTALLATION_DOMAIN + instead of GNUSTEP_INSTALLATION_DIR. + * Documentation/GNUmakefile: Same change. + * Fonts/GNUmakefile: Same change. + * Source/GNUmakefile: Same change. + * Source/art/GNUmakefile: Same change. + * Source/cairo/GNUmakefile: Same change. + * Source/gsc/GNUmakefile: Same change. + * Source/x11/GNUmakefile: Same change. + * Source/xdps/GNUmakefile: Same change. + * Source/xlib/GNUmakefile: Same change. + * Source/win32/GNUmakefile: Same change. + * Source/winlib/GNUmakefile: Same change. + * Tools/GNUmakefile: Same change. + 2006-11-03 Richard Frith-Macdonald * Source/xlib/XGFont.m: Assume ascii encoding as a fallback if no diff --git a/Documentation/Back/GNUmakefile b/Documentation/Back/GNUmakefile index 3e01a3c..747ad4d 100644 --- a/Documentation/Back/GNUmakefile +++ b/Documentation/Back/GNUmakefile @@ -21,7 +21,7 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. # Install into the system root by default -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index a39cd9a..28778ca 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -21,7 +21,7 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. # Install into the system root by default -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Fonts/GNUmakefile b/Fonts/GNUmakefile index 08b1e47..3821523 100644 --- a/Fonts/GNUmakefile +++ b/Fonts/GNUmakefile @@ -21,7 +21,7 @@ # License along with this library; if not, write to the Free # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/GNUmakefile.postamble b/GNUmakefile.postamble index 9993b1f..8a07c8b 100644 --- a/GNUmakefile.postamble +++ b/GNUmakefile.postamble @@ -28,14 +28,14 @@ # Things to do after compiling # after-all:: -$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional: - $(MKDIRS) $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional +$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional: + $(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional # Things to do before installing ifeq ($(BACKEND_BUNDLE),) -before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional +before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional $(INSTALL_DATA) back.make \ - $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional/back.make + $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/back.make endif # Things to do after installing diff --git a/Source/GNUmakefile b/Source/GNUmakefile index 9c77079..5605da6 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -23,7 +23,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Install into the system root by default -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/art/GNUmakefile b/Source/art/GNUmakefile index 334aca0..d4e3eac 100644 --- a/Source/art/GNUmakefile +++ b/Source/art/GNUmakefile @@ -23,7 +23,7 @@ # If not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/cairo/GNUmakefile b/Source/cairo/GNUmakefile index 0e6a3a3..c516aeb 100644 --- a/Source/cairo/GNUmakefile +++ b/Source/cairo/GNUmakefile @@ -19,7 +19,7 @@ # If not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/gsc/GNUmakefile b/Source/gsc/GNUmakefile index ee2631f..40690bb 100644 --- a/Source/gsc/GNUmakefile +++ b/Source/gsc/GNUmakefile @@ -25,7 +25,7 @@ # If not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/win32/GNUmakefile b/Source/win32/GNUmakefile index 88f420a..3191abf 100644 --- a/Source/win32/GNUmakefile +++ b/Source/win32/GNUmakefile @@ -25,7 +25,7 @@ # If not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make diff --git a/Source/winlib/GNUmakefile b/Source/winlib/GNUmakefile index 64659ac..8e737b2 100644 --- a/Source/winlib/GNUmakefile +++ b/Source/winlib/GNUmakefile @@ -22,7 +22,7 @@ # If not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/x11/GNUmakefile b/Source/x11/GNUmakefile index 01620ce..6b8b910 100644 --- a/Source/x11/GNUmakefile +++ b/Source/x11/GNUmakefile @@ -25,7 +25,7 @@ # If not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make diff --git a/Source/xdps/GNUmakefile b/Source/xdps/GNUmakefile index 260a2bc..8db1982 100644 --- a/Source/xdps/GNUmakefile +++ b/Source/xdps/GNUmakefile @@ -25,7 +25,7 @@ # If not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/xlib/GNUmakefile b/Source/xlib/GNUmakefile index 2ed4cf9..c5aef9a 100644 --- a/Source/xlib/GNUmakefile +++ b/Source/xlib/GNUmakefile @@ -25,7 +25,7 @@ # If not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../back.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index 999abd4..bd61bf7 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -22,7 +22,7 @@ # If not, write to the Free Software Foundation, # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../back.make include $(GNUSTEP_MAKEFILES)/common.make