[Gsrc-commit] /srv/bzr/gsrc/trunk r1400: ignore CREATED_MERGE_DIRS variable because it only causes problems

[Brandon Invergo]

------------------------------------------------------------
revno: 1400
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-11 23:56:21 +0100
message:
  ignore CREATED_MERGE_DIRS variable because it only causes problems
modified:
  ChangeLog
  gar.lib.mk

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-12-11 08:45:44 +0000
+++ b/ChangeLog 2012-12-11 22:56:21 +0000
@@ -1,7 +1,11 @@
 2012-12-11  Brandon Invergo  <address@hidden>
 
+       * gar.lib.mk (CREATED_MERGE_DIRS): don't use this variable; it
+       results in many files not being installed correctly, such as files
+       in etc/
+
        * gar.lib/gnustep.mk: create recipe to set up the GNUstep build
-       environment 
+       environment
 
 2012-12-10  Brandon Invergo  <address@hidden>
 

=== modified file 'gar.lib.mk'
--- a/gar.lib.mk        2012-12-10 22:53:36 +0000
+++ b/gar.lib.mk        2012-12-11 22:56:21 +0000
@@ -623,11 +623,11 @@
 
 # Directories that should have pristine versions stored to be merged upon
 # installation.
-CREATED_MERGE_DIRS = \
-       sysconf $(sysconfdir) \
-       var $(vardir) \
-       boot $(bootdir) \
-       rootlib /lib
+#      Removed: sysconf $(sysconfdir) (etc/)
+#      var $(vardir) 
+#      boot $(bootdir) 
+#      rootlib /lib
+CREATED_MERGE_DIRS = 
 
 # Directories that will be merged if created by a package, but won't be
 # created automatically.