[Gsrc-commit] trunk r2630: fix install-p

[Brandon Invergo]

------------------------------------------------------------
revno: 2630
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2013-11-04 13:43:13 +0100
message:
  fix install-p
modified:
  ChangeLog                      changelog-20100709141706-qgja2j0qu34ekbcd-1
  gar.mk                         gar.mk-20100602191336-d3df1ggfm1r56woa-6

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-10-29 09:23:27 +0000
+++ b/ChangeLog 2013-11-04 12:43:13 +0000
@@ -1,3 +1,7 @@
+2013-11-04  Brandon Invergo  <address@hidden>
+
+       * gar.mk (install-p): Fix boolean statement grouping
+
 2013-10-29  Brandon Invergo  <address@hidden>
 
        * gar.mk (install-src): Install source from a clean tree
@@ -272,4 +276,3 @@
 
        * gar.mk (%-log): allow output to be logged into a logs/
        subdirectory with targets like configure-log, build-log, etc
-

=== modified file 'gar.mk'
--- a/gar.mk    2013-10-29 09:23:27 +0000
+++ b/gar.mk    2013-11-04 12:43:13 +0000
@@ -96,7 +96,7 @@
 # define something like "pre-configure" and it won't conflict,
 # while the configure target can call "pre-configure" safely even
 # if the port maintainer hasn't defined it.
-# 
+#
 # in addition to the pre-<target> rules, the maintainer may wish
 # to set a "pre-everything" rule, which runs before the first
 # actual target.
@@ -109,7 +109,7 @@
 custom-%:
        @true
 
-# ========================= MAIN RULES ========================= 
+# ========================= MAIN RULES =========================
 # The main rules are the ones that the user can specify as a
 # target on the "make" command-line.  Currently, they are:
 #      fetch-list fetch checksum makesum extract checkpatch patch
@@ -126,7 +126,7 @@
 #        cookie files in $(COOKIEDIR), but in the case of fetch are
 #        actual downloaded files in $(DOWNLOADDIR)
 #      - run the post- rule for the target
-# 
+#
 # The main rules also run the $(DONADA) code, which prints out
 # what just happened when all the dependencies are finished.
 
@@ -146,7 +146,7 @@
        @printf "$(OK)$(lastword $(subst /, ,$(dir $(shell 
pwd))))/$(MSG2)$(GARNAME) $(OFF)$(GARVERSION)\n"
        @printf " $(DESCRIPTION)\n"
 
-# pkg-rec: generate GNU Recutils-friendly package listings. In other words, 
this 
+# pkg-rec: generate GNU Recutils-friendly package listings. In other words, 
this
 # output is more easily machine-readable than that of pkg-info
 pkg-rec:
        @printf "Garname: $(GARNAME)\n"
@@ -302,8 +302,8 @@
 # returns true if install has completed successfully, false
 # otherwise
 install-p:
-       test -h $(dotgardir)/VERSION && \
-               (test "`readlink $(dotgardir)/VERSION`" = $(PACKAGENAME) && \
+       (test -h $(dotgardir)/VERSION && \
+               test "`readlink $(dotgardir)/VERSION`" = $(PACKAGENAME) && \
                printf "[$(OK)install-p$(OFF)] $(MSG)$(PACKAGENAME) is 
installed$(OFF)\n") || \
                (printf "[$(ERR)install-p$(OFF)] $(MSG)$(PACKAGENAME) is not 
installed$(OFF)\n" && exit 1) \
 
@@ -354,7 +354,7 @@
 
 # Check in a trivially-updated package.
 ci:
-       bzr commit . -m 'update $(GARNAME) to $(GARVERSION)' 
+       bzr commit . -m 'update $(GARNAME) to $(GARVERSION)'
 
 # Automatically find dependencies (after a configure).
 find-deps:
@@ -367,7 +367,7 @@
 DEPS=$(LIBDEPS) $(BUILDDEPS) $(if $(USE_TESTS),$(TESTDEPS),)
 
 dep-list:
-       @echo $(DEPS) 
+       @echo $(DEPS)
 
 checkdeps: $(addprefix checkdep-$(GARDIR)/,$(LIBDEPS) $(BUILDDEPS) $(if 
$(USE_TESTS),$(TESTDEPS),) $(INSTALLDEPS)) checkdep-users checkdep-groups
        $(DONADA)
@@ -375,7 +375,7 @@
 checkdep-$(GARDIR)/%:
        $(MAKE) -C $(call pathsearch,$*,$(DEPPATH)) fetch-list
 
-install-deps: $(addprefix dep-$(GARDIR)/,$(LIBDEPS) $(BUILDDEPS) $(if 
$(USE_TESTS),$(TESTDEPS),) $(INSTALLDEPS)) 
+install-deps: $(addprefix dep-$(GARDIR)/,$(LIBDEPS) $(BUILDDEPS) $(if 
$(USE_TESTS),$(TESTDEPS),) $(INSTALLDEPS))
        $(DONADA)