aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-01-25 20:07:39 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2009-01-25 20:07:39 +0000
commit2df8bfdb5cc70f5f39820e4c38cdcf9cf6495980 (patch)
tree0c77f6787d521ebfaaddcd482d59793b9f73583b
parentfd718f9ec7b1fed971154a1393c05ddbef338c2a (diff)
replaced second test with a || so that make doesn't catch the 'false' exit condition of the first test
svn path=/trunk/; revision=10636
-rw-r--r--packages/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/Makefile b/packages/Makefile
index 022f2b74..9364cb30 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -246,9 +246,8 @@ endif
install -p $(gem_src)/doc/*.* $(manualsdir)/$(GEM_NAME)
install -d $(manualsdir)/$(GEM_NAME)/manual
# in Gem 0.92, $(gem_src)/manual moved to $(gem_src)/doc/manual
- test -d $(gem_src)/manual && \
- install -p $(gem_src)/manual/*.* $(manualsdir)/$(GEM_NAME)/manual
- test -d $(gem_src)/doc/manual && \
+ (test -d $(gem_src)/manual && \
+ install -p $(gem_src)/manual/*.* $(manualsdir)/$(GEM_NAME)/manual) || \
install -p $(gem_src)/doc/manual/*.* $(manualsdir)/$(GEM_NAME)/manual
for dir in $(shell ls -1 $(gem_src)/examples | grep -v CVS); do \
echo "installing $$dir"; \