Changeset 871

Timestamp:

Dec 3, 2008, 11:29:57 PM (13 years ago)

Author:

Peter Johansson

Message:

install-exec-local didn't respect DESTDIR. Copying code generated by Automake.

File:

• plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am (modified) (2 diffs)

plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am

@@ -32 +32 @@
 CLASS = $(JAVA:.java=.class)
 WeNNI  = WeNNI.jar
+inst_JARS = $(WeNNI) $(Pluginutilities).jar
 
 if DOWNLOADBASEAPI
@@ -44 +45 @@
   @( rm -rf $(DOWNLOADDEP) $(PLUGINutilities) $(PLUGINutilities).tgz )
 
-install-exec-local: $(WeNNI)
+install-exec-local: $(inst_JARS)
   @$(NORMAL_INSTALL)
-  test -z "$(bindir)" || $(MKDIR_P) "$(bindir)"
-  $(INSTALL) "$(WeNNI)" "$(bindir)"
-  $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(bindir)"
+  test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+  @list='$(inst_JARS)'; for p in $$list; do \
+    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+    if test -f $$d$$p; then \
+      f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+      echo " $(INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+      $(INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+    else :; fi; \
+  done
 
 uninstall-local:
   @$(NORMAL_UNINSTALL)
-  rm -f "$(bindir)/$(WeNNI)"
-  rm -f "$(bindir)/$(PLUGINutilities).jar"
+  @list='$(inst_JARS)'; for p in $$list; do \
+    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+    echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+    rm -f "$(DESTDIR)$(bindir)/$$f"; \
+  done
 
 $(WeNNI): $(BUILDDIR) $(PLUGINutilities) $(DOWNLOADDEP) $(CLASS) manifest