From bfed357ff4d51480bdfe65507871fefbd8c09ce5 Mon Sep 17 00:00:00 2001 From: fedor Date: Tue, 1 Dec 1998 14:41:53 +0000 Subject: [PATCH] Makefile fix ups. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3361 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ Source/Makefile.postamble | 17 ++++++++++++++--- Testing/.cvsignore | 1 + Version | 1 + 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8999b7cb2..4a1c27599 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 1 09:31:59 1998 Adam Fedor + + * src/Makefile.postamble: new variable INSTALL_ROOT_DIR, such that + /etc/services can be installed somewhere (need this for building + Debian binary packages). Patch from Matthias Klose + . + Mon Nov 30 10:20:00 1998 Richard Frith-Macdonald * src/NSTask: Minor bugfix -ignore SIGCHLD diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble index 4b443fc0d..cba7608ab 100644 --- a/Source/Makefile.postamble +++ b/Source/Makefile.postamble @@ -53,9 +53,20 @@ after-install:: $(INSTALL_DATA) ./include/$$file \ $(GNUSTEP_HEADERS)/gnustep/base/$$file ; \ done - if [ "`fgrep gdomap /etc/services`" = "" ]; then \ - echo "gdomap 538/tcp # GNUstep distrib objects" >> /etc/services; \ - echo "gdomap 538/udp # GNUstep distrib objects" >> /etc/services; \ + if [ "$(INSTALL_ROOT_DIR)" = "" ]; then \ + if [ "`whoami`" != root ]; then \ + echo "WARNING: Please add the following lines yourself"; \ + fi; \ + services=/etc/services; \ + else \ + mkdir -p $(INSTALL_ROOT_DIR)/etc; \ + services=$(INSTALL_ROOT_DIR)/etc/services.add; \ + echo "GNUstep addons for /etc/services written to $$services"; \ + fi; \ + if [ "`fgrep gdomap $$services >/dev/null`" = "" ]; then \ + set -x; \ + echo "gdomap 538/tcp # GNUstep distrib objects" >> $$services; \ + echo "gdomap 538/udp # GNUstep distrib objects" >> $$services; \ fi # Things to do before uninstalling diff --git a/Testing/.cvsignore b/Testing/.cvsignore index 4eaec2e7a..608159572 100644 --- a/Testing/.cvsignore +++ b/Testing/.cvsignore @@ -7,3 +7,4 @@ nstimer nsnotification nxst fref heap basic release nsscanner nsdate awake thread-except nscharacterset *.txt *.dat +LoadMe.bundle diff --git a/Version b/Version index 4eb57ae12..186f8cdef 100644 --- a/Version +++ b/Version @@ -1,4 +1,5 @@ # This file is included in various Makefile's to get version information. +# Compatible with Bourne shell syntax, so it can included there too. # The gcc version required to compile the library. GCC_VERSION=2.8.0