Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am

    r870 r871  
    3232CLASS = $(JAVA:.java=.class)
    3333WeNNI  = WeNNI.jar
     34inst_JARS = $(WeNNI) $(Pluginutilities).jar
    3435
    3536if DOWNLOADBASEAPI
     
    4445  @( rm -rf $(DOWNLOADDEP) $(PLUGINutilities) $(PLUGINutilities).tgz )
    4546
    46 install-exec-local: $(WeNNI)
     47install-exec-local: $(inst_JARS)
    4748  @$(NORMAL_INSTALL)
    48   test -z "$(bindir)" || $(MKDIR_P) "$(bindir)"
    49   $(INSTALL) "$(WeNNI)" "$(bindir)"
    50   $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(bindir)"
     49  test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
     50  @list='$(inst_JARS)'; for p in $$list; do \
     51    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     52    if test -f $$d$$p; then \
     53      f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
     54      echo " $(INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
     55      $(INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
     56    else :; fi; \
     57  done
    5158
    5259uninstall-local:
    5360  @$(NORMAL_UNINSTALL)
    54   rm -f "$(bindir)/$(WeNNI)"
    55   rm -f "$(bindir)/$(PLUGINutilities).jar"
     61  @list='$(inst_JARS)'; for p in $$list; do \
     62    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
     63    echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
     64    rm -f "$(DESTDIR)$(bindir)/$$f"; \
     65  done
    5666
    5767$(WeNNI): $(BUILDDIR) $(PLUGINutilities) $(DOWNLOADDEP) $(CLASS) manifest
Note: See TracChangeset for help on using the changeset viewer.