[Gsrc-commit] trunk r2954: conditionally add GARPROFILE to the .gar package directory name

[Brandon Invergo]

------------------------------------------------------------
revno: 2954
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Fri 2014-05-23 17:56:51 +0100
message:
  conditionally add GARPROFILE to the .gar package directory name
modified:
  ChangeLog                      changelog-20100709141706-qgja2j0qu34ekbcd-1
  gar.lib.mk                     gar.lib.mk-20100602191336-d3df1ggfm1r56woa-4

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-01-06 19:21:28 +0000
+++ b/ChangeLog 2014-05-23 16:56:51 +0000
@@ -1,3 +1,8 @@
+2014-05-23  Brandon Invergo  <address@hidden>
+
+       * gar.lib.mk (dotgardir): Conditionally add GARPROFILE to the .gar
+       package directory.
+
 2013-12-08  Brandon Invergo  <address@hidden>
 
        * gar.mk (install-src-p): Remove output

=== modified file 'gar.lib.mk'
--- a/gar.lib.mk        2014-05-23 16:49:28 +0000
+++ b/gar.lib.mk        2014-05-23 16:56:51 +0000
@@ -617,7 +617,7 @@
 packagedir = $(packagesdir)/$(PACKAGENAME)
 
 # Directory containing GARstow files for the package.
-dotgardir = $(prefix)/.gar/$(GARNAME)
+dotgardir = $(prefix)/.gar/$(GARNAME)$(if $(GARPROFILE),-$(GARPROFILE))
 
 # Directories to use during installation.
 packageDESTDIR = $(packagesdir)/$(PACKAGENAME)-DEST
@@ -823,8 +823,7 @@
        if [ "$(filter $*,$(IGNORE_DEPS))" != "" ] ; then \
                printf "[$(OK)install-deps$(OFF)] $(MSG)Ignoring dependency 
$*$(OFF)\n" ; \
        else \
-               printf "[$(OK)install-deps$(OFF)] $(MSG)Building $* as a 
dependency$
-(OFF)\n" ; \
+               printf "[$(OK)install-deps$(OFF)] $(MSG)Building $* as a 
dependency$(OFF)\n" ; \
                $(if $(FORCE_REBUILD),,$(MAKE) -C $(DEP) install-p $(OUTPUT) || 
($(MAKE) -C $(DEP) reinstall-p && $(MAKE) -C $(DEP) reinstall $(OUTPUT)) ) || 
$(MAKE) -C $(DEP) install $(OUTPUT); \
        fi