From 445af8595d76693d64795d1182e90e9af87ff61c Mon Sep 17 00:00:00 2001 From: nicola Date: Wed, 15 Nov 2006 16:59:32 +0000 Subject: [PATCH] Updated to use GNUSTEP_INSTALLATION_DOMAIN instead of GNUSTEP_INSTALLATION_DIR; DESTDIR instead of INSTALL_ROOT_DIR; and fixed some makefile installation bugs git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24094 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 29 +++++++++++++++++++++++++++++ ColorPickers/GNUmakefile | 2 +- Documentation/GNUmakefile | 2 +- Documentation/General/GNUmakefile | 2 +- Documentation/GuiUser/GNUmakefile | 2 +- GNUmakefile.postamble | 8 ++++---- Images/GNUmakefile | 2 +- Model/GNUmakefile | 2 +- Panels/GNUmakefile | 2 +- Panels/GNUmakefile.postamble | 20 ++++++++++---------- PrinterTypes/GNUmakefile | 2 +- Printing/GSLPR/GNUmakefile | 22 +--------------------- Resources/GNUmakefile | 2 +- Source/GNUmakefile | 2 +- Tools/GNUmakefile | 2 +- Tools/gsnd/GNUmakefile | 2 +- 16 files changed, 56 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index d467ccee6..6a7a05f83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +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 instead of INSTALL_ROOT_DIR + everywhere. + + * ColorPickers/GNUmakefile: (GNUSTEP_INSTALLATION_DOMAIN): Use + GNUSTEP_INSTALLATION_DOMAIN instead of GNUSTEP_INSTALLATION_DIR. + * Documentation/GNUmakefile: Same change. + * Documentation/General/GNUmakefile: Same change. + * Documentation/GuiUser/GNUmakefile: Same change. + * Images/GNUmakefile: Same change. + * Model/GNUmakefile: Same change. + * Panels/GNUmakefile: Same change. + * PrinterTypes/GNUmakefile: Same change. + * Resources/GNUmakefile: Same change. + * Source/GNUmakefile: Same change. + * Tools/GNUmakefile: Same change. + * Tools/gsnd/GNUmakefile: Same change. + + * Printing/GSLPR/GNUmakefile (GNUSTEP_INSTALLATION_DOMAIN): Same change, + plus set GNUSTEP_INSTALLATION_DOMAIN before common.make and not after. + + * Panels/GNUmakefile.postamble: Fixed all install/uninstall + targets that were failing to create the install directories + properly. Also, added ECHO macros so that 'make messages=yes' + works properly. + 2006-11-12 Matt Rice * Source/NSTableView.m (-noteNumberOfRowsChanged:): Post selection diff --git a/ColorPickers/GNUmakefile b/ColorPickers/GNUmakefile index c95b98c8f..937c71eb0 100644 --- a/ColorPickers/GNUmakefile +++ b/ColorPickers/GNUmakefile @@ -27,7 +27,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 = ../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index a2ebc2013..f77cbd14b 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -22,7 +22,7 @@ # 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=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Documentation/General/GNUmakefile b/Documentation/General/GNUmakefile index 7907ba5c0..98e3288ba 100644 --- a/Documentation/General/GNUmakefile +++ b/Documentation/General/GNUmakefile @@ -24,7 +24,7 @@ # # Install into the system root by default -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM include $(GNUSTEP_MAKEFILES)/common.make include ../../config.make diff --git a/Documentation/GuiUser/GNUmakefile b/Documentation/GuiUser/GNUmakefile index ced6667e2..2317dcd81 100644 --- a/Documentation/GuiUser/GNUmakefile +++ b/Documentation/GuiUser/GNUmakefile @@ -23,7 +23,7 @@ # # Install into the system root by default -GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM include $(GNUSTEP_MAKEFILES)/common.make include ../../config.make diff --git a/GNUmakefile.postamble b/GNUmakefile.postamble index 336c0c9aa..f2f746d3e 100644 --- a/GNUmakefile.postamble +++ b/GNUmakefile.postamble @@ -45,13 +45,13 @@ # 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)/Additional: - $(MKDIRS) $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional +$(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional: + $(MKDIRS) $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional # Things to do before installing -before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional +before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional $(INSTALL_DATA) gui.make \ - $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make + $(DESTDIR)$(GNUSTEP_MAKEFILES)/Additional/gui.make # Things to do after installing # after-install:: diff --git a/Images/GNUmakefile b/Images/GNUmakefile index bccde8826..fe9acb225 100644 --- a/Images/GNUmakefile +++ b/Images/GNUmakefile @@ -22,7 +22,7 @@ # 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=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Model/GNUmakefile b/Model/GNUmakefile index 319423140..810c99600 100644 --- a/Model/GNUmakefile +++ b/Model/GNUmakefile @@ -22,7 +22,7 @@ # 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=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Panels/GNUmakefile b/Panels/GNUmakefile index 5a3f62a8d..ab5c5addf 100644 --- a/Panels/GNUmakefile +++ b/Panels/GNUmakefile @@ -26,7 +26,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=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Panels/GNUmakefile.postamble b/Panels/GNUmakefile.postamble index 97a37c252..2b441ecf6 100644 --- a/Panels/GNUmakefile.postamble +++ b/Panels/GNUmakefile.postamble @@ -26,9 +26,9 @@ # Things to do after installing after-install:: ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),) - @(echo "Copying localized resources into system..."; \ + $(ECHO_NOTHING)echo "Copying localized resources into system..."; \ for l in $(LANGUAGES); do \ - if [ ! -f $$l.lproj ]; then \ + if [ ! -d $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj ]; then \ $(MKDIRS) $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \ fi; \ for f in $(LOCALIZED_RESOURCE_FILES); do \ @@ -36,30 +36,30 @@ ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),) cp -r $$l.lproj/$$f $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \ fi; \ done; \ - done;) + done$(END_ECHO) endif ifneq ($(strip $(LOCALIZED_RESOURCE_COMPONENTS)),) - @(echo "Copying localized components into system..."; \ + $(ECHO_NOTHING)echo "Copying localized components into system..."; \ for l in $(LANGUAGES); do \ - if [ ! -f $$l.lproj ]; then \ + if [ ! -d $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj ]; then \ $(MKDIRS) $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \ fi; \ for f in $(LOCALIZED_RESOURCE_COMPONENTS); do \ if [ -d $$l.lproj/$$f ]; then \ cp -r $$l.lproj/$$f $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \ - rm -rf $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj/$$f/CVS; \ + rm -rf $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj/$$f/.svn; \ fi; \ done; \ - done;) + done$(END_ECHO) endif # Things to do after uninstalling after-uninstall:: ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),) - @(for l in $(LANGUAGES); do \ - if [ ! -f $$l.lproj ]; then \ + $(ECHO_NOTHING)for l in $(LANGUAGES); do \ + if [ -d $$l.lproj ]; then \ rm -rf $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \ fi; \ - done;) + done$(END_ECHO) endif diff --git a/PrinterTypes/GNUmakefile b/PrinterTypes/GNUmakefile index e126d6531..af0df267a 100644 --- a/PrinterTypes/GNUmakefile +++ b/PrinterTypes/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=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Printing/GSLPR/GNUmakefile b/Printing/GSLPR/GNUmakefile index 97a775f4d..daf19b09f 100644 --- a/Printing/GSLPR/GNUmakefile +++ b/Printing/GSLPR/GNUmakefile @@ -25,22 +25,16 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../gui.make +GNUSTEP_INSTALLATION_DOMAIN = SYSTEM include $(GNUSTEP_MAKEFILES)/common.make include ../../config.make include ../../Version -GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT) - - - - BUNDLE_NAME=GSLPR BUNDLE_INSTALL_DIR= $(GNUSTEP_BUNDLES)/GSPrinting GSLPR_PRINCIPAL_CLASS=GSLPRPrincipalClass - - ifeq ($(GNUSTEP_TARGET_OS),mingw32) GSLPR_BUNDLE_LIBS += -lgnustep-gui $(FND_LIBS) $(OBJC_LIBS) endif @@ -48,20 +42,16 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin) GSLPR_BUNDLE_LIBS += -lgnustep-gui $(FND_LIBS) $(OBJC_LIBS) endif - - # # Libraries # #GSLPR_LIBRARIES_DEPEND_UPON += - # # Resource files # #GSLPR_RESOURCE_FILES = - # # Header files # @@ -73,7 +63,6 @@ GSLPR_HEADERS= \ GSLPRPrintPanel.m \ GSLPRPrinter.m - # # Class files # @@ -85,20 +74,17 @@ GSLPR_OBJC_FILES= \ GSLPRPrintPanel.m \ GSLPRPrinter.m - # # C files # #GSLPR_C_FILES = - # # Languages # #GSLPR_LANGUAGES= \ # English - # # Localized Resource Files # @@ -106,12 +92,6 @@ GSLPR_OBJC_FILES= \ # GSLPRPrintPanel.gorm \ # GSLPRPageLayout.gorm - - - - - - # # Makefiles # diff --git a/Resources/GNUmakefile b/Resources/GNUmakefile index 73dd7f487..5c356c1f7 100644 --- a/Resources/GNUmakefile +++ b/Resources/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=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Source/GNUmakefile b/Source/GNUmakefile index f5adb9f39..77f1e3c7d 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -24,7 +24,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=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index 9b6d13a69..f18a95b54 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -20,7 +20,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=../gui.make include $(GNUSTEP_MAKEFILES)/common.make diff --git a/Tools/gsnd/GNUmakefile b/Tools/gsnd/GNUmakefile index c35d2c0dd..c34a69ba4 100644 --- a/Tools/gsnd/GNUmakefile +++ b/Tools/gsnd/GNUmakefile @@ -20,7 +20,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 include $(GNUSTEP_MAKEFILES)/common.make