mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 12:00:45 +00:00
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
This commit is contained in:
Nicola Pero
parent
4475b975b8
commit
fb51fe62fe
16 changed files with 56 additions and 47 deletions
29
ChangeLog
29
ChangeLog
|
|
@ -1,3 +1,32 @@
|
|||
2006-11-15 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
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 <ratmice@gmail.com>
|
||||
|
||||
* Source/NSTableView.m (-noteNumberOfRowsChanged:): Post selection
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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::
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
#
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue