gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-02-19 01:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use GNUSTEP_INSTALLATION_DOMAIN and DESTDIR

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@24097 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2006-11-15 17:19:55 +00:00
parent 36cdef1fba
commit da3ada8346
7 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
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 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 <ayers@fsfe.org> 2006-10-04 David Ayers <ayers@fsfe.org>
* GSWeb.framework/GSWDefaultAdaptorThread.m * GSWeb.framework/GSWDefaultAdaptorThread.m

3
Examples/hello/GNUmakefile
View file

@ -22,9 +22,6 @@
# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # 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)/common.make
include $(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make include $(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make

2
GNUmakefile
View file

@ -22,8 +22,6 @@
# License along with this library; if not, write to the Free # License along with this library; if not, write to the Free
# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
include ./Version include ./Version

3
GSWExtensions.framework/GNUmakefile
View file

@ -20,9 +20,6 @@
# License along with this library; if not, write to the Free # License along with this library; if not, write to the Free
# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # 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)/common.make
include ../Version include ../Version

3
GSWExtensionsGSW.framework/GNUmakefile
View file

@ -20,9 +20,6 @@
# License along with this library; if not, write to the Free # License along with this library; if not, write to the Free
# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # 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)/common.make
include ../Version include ../Version

11
GSWeb.framework/GNUmakefile
View file

@ -21,9 +21,6 @@
# License along with this library; if not, write to the Free # License along with this library; if not, write to the Free
# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # 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 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gsweb.make
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
ifeq ($(GDL2),yes) ifeq ($(GDL2),yes)
@ -47,10 +44,10 @@ FRAMEWORK_NAME = GSWeb WebObjects
endif endif
# Ensure that each framework uses its own GNUSTEP_OBJ_DIR_NAME & DERIVED_SRC # Ensure that each framework uses its own GNUSTEP_OBJ_DIR_NAME & DERIVED_SRC
ifneq ($(GNUSTEP_INSTANCE),) #ifneq ($(GNUSTEP_INSTANCE),)
GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME)/$(GNUSTEP_INSTANCE) #GNUSTEP_OBJ_DIR_NAME := $(GNUSTEP_OBJ_DIR_NAME)/$(GNUSTEP_INSTANCE)
DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE) #DERIVED_SRC := $(DERIVED_SRC)/$(GNUSTEP_INSTANCE)
endif #endif
WebObjects_CPPFLAGS = -DGSWEB_WONAMES WebObjects_CPPFLAGS = -DGSWEB_WONAMES

12
Makefile.postamble
View file

@ -46,15 +46,15 @@ gsdocs:
# The following rule is important mainly for packaging, because in that case # 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. # you install into a fake system tree, and the directory is not there.
# #
$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary:
$(MKINSTALLDIRS) $@ $(MKINSTALLDIRS) $@
# Things to do before installing # Things to do before installing
before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary before-install:: $(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary
$(INSTALL_DATA) gsweb.make \ $(INSTALL_DATA) gsweb.make \
$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make $(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make
$(INSTALL_DATA) gsweb_wo.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 # Things to do after installing
#after-install:: #after-install::
@ -64,8 +64,8 @@ before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary
# Things to do after uninstalling # Things to do after uninstalling
after-uninstall:: after-uninstall::
rm -f $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make
rm -f $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb_wo.make rm -f $(DESTDIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb_wo.make
# Things to do before cleaning # Things to do before cleaning
# before-clean:: # before-clean::