Minor tidyups to back makefiles; removed references to GNUmakefile.lo…

…cal (totally obsolete) and minor fix for uninstalling git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@29558 72102866-910b-0410-8b05-ffd578937521
gnustep · Feb 11, 2010 · 959b852 · 959b852
1 parent 39c9297
commit 959b852
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-11  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* Documentation/Back/GNUmakefile: Do not try including the
+	non-existing GNUmakefile.local file.
+	* Documentation/GNUmakefile: Same change.
+	* Fonts/GNUmakefile: Same change.
+	* Source/winlib/GNUmakefile: Same change.
+	* Tools/GNUmakefile: Same change.
+
+	* Fonts/GNUmakefile.postamble (before-uninstall): Remove
+	back-resources_INSTALL_DIR if empty.
+
 2010-02-10 Eric Wasylishen <ewasylishen@gmail.com>
 
 	* Source/x11/XGServerWindow.m:

diff --git a/Documentation/Back/GNUmakefile b/Documentation/Back/GNUmakefile
@@ -40,8 +40,6 @@ General_DOC_INSTALL_DIR = Developer/Back
 
 -include GNUmakefile.preamble
 
--include GNUmakefile.local
-
 include $(GNUSTEP_MAKEFILES)/documentation.make
 
 -include GNUmakefile.postamble
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
@@ -57,8 +57,6 @@ ANNOUNCE_DOC_INSTALL_DIR = Developer/Back/ReleaseNotes/$(VERSION)
 
 -include Makefile.preamble
 
--include GNUmakefile.local
-
 include $(GNUSTEP_MAKEFILES)/documentation.make
 include $(GNUSTEP_MAKEFILES)/aggregate.make
 

diff --git a/Fonts/GNUmakefile b/Fonts/GNUmakefile
@@ -31,8 +31,6 @@ back-resources_RESOURCE_FILES = $(FONT_INSTALL_FILES)
 
 FONT_INSTALL_FILES = Helvetica.nfont
 
--include GNUmakefile.local
-
 include $(GNUSTEP_MAKEFILES)/rules.make
 
 -include GNUmakefile.postamble

diff --git a/Fonts/GNUmakefile.postamble b/Fonts/GNUmakefile.postamble
@@ -44,6 +44,7 @@ before-uninstall::
 	for file in $(FONT_INSTALL_FILES); do \
 	  rm -rf $(back-resources_INSTALL_DIR)/$$file;\
 	done
+	-rmdir $(back-resources_INSTALL_DIR)
 
 # Things to do after uninstalling
 # after-uninstall::

diff --git a/Source/winlib/GNUmakefile b/Source/winlib/GNUmakefile
@@ -43,8 +43,6 @@ WIN32FontInfo.m
 
 -include GNUmakefile.preamble
 
--include GNUmakefile.local
-
 include $(GNUSTEP_MAKEFILES)/subproject.make
 
 -include GNUmakefile.postamble
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
@@ -57,8 +57,6 @@ MAN1_PAGES = gpbs.1
 
 -include GNUmakefile.preamble
 
--include GNUmakefile.local
-
 include $(GNUSTEP_MAKEFILES)/tool.make
 
 -include GNUmakefile.postamble