Changeset 866


Ignore:
Timestamp:
Dec 3, 2008, 7:40:28 PM (13 years ago)
Author:
Peter Johansson
Message:

simplify syntax of install-plugin targets by using install target

Location:
plugins/base1/se.lu.thep.wenni/trunk
Files:
5 edited

Legend:

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

    r853 r866  
    3434EXTRA_DIST = Clone.h Data.h Parameter.h
    3535
    36 install-plugin: $(PROGRAMS)
    37   @echo Making $@
    38   test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
    39   @for i in $(PROGRAMS); do \
    40     ( echo "$(INSTALL) $$i $(PLUGINDIR)" ; $(INSTALL) $$i $(PLUGINDIR) ) \
    41   done
     36install-plugin:
     37  $(MAKE) $(AM_MAKEFLAGS) bindir=$(PLUGINDIR) install
  • plugins/base1/se.lu.thep.wenni/trunk/base/base1/base_plugin_script/Makefile.am

    r853 r866  
    2525dist_bin_SCRIPTS = wenni.pl
    2626
    27 install-plugin: $(SCRIPTS)
    28   @echo Making $@
    29   test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
    30   @for i in $(SCRIPTS); do \
    31     ( echo "$(INSTALL) $$i $(PLUGINDIR)" ; $(INSTALL) $$i $(PLUGINDIR) ) \
    32   done
     27install-plugin:
     28  $(MAKE) $(AM_MAKEFLAGS) bindir=$(PLUGINDIR) install
  • plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am

    r865 r866  
    5353  rm -f "$(bindir)/$(PLUGINutilities).jar"
    5454
    55 install-plugin: $(WeNNI)
    56   @$(NORMAL_INSTALL)
    57   test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
    58   $(INSTALL) "$(WeNNI)" "$(PLUGINDIR)"
    59   $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(PLUGINDIR)"
     55install-plugin:
     56  $(MAKE) $(AM_MAKEFLAGS) bindir=$(PLUGINDIR) install
    6057
    6158uninstall-plugin:
    62   @$(NORMAL_UNINSTALL)
    63   rm -f "$(PLUGINDIR)/$(WeNNI)"
    64   rm -f "$(PLUGINDIR)/$(PLUGINutilities).jar"
     59  $(MAKE) $(AM_MAKEFLAGS) bindir=$(PLUGINDIR) uninstall
    6560
    6661$(WeNNI): $(BUILDDIR) $(PLUGINutilities) $(DOWNLOADDEP) $(CLASS) manifest
  • plugins/base1/se.lu.thep.wenni/trunk/bin/NNIFileConverter/Makefile.am

    r853 r866  
    3333EXTRA_DIST = Parameter.h
    3434
    35 install-plugin: $(PROGRAMS)
    36   @echo Making $@
    37   test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
    38   @for i in $(PROGRAMS); do \
    39     ( echo "$(INSTALL) $$i $(PLUGINDIR)" ; $(INSTALL) $$i $(PLUGINDIR) ) \
    40   done
     35install-plugin:
     36  $(MAKE) $(AM_MAKEFLAGS) bindir=$(PLUGINDIR) install
  • plugins/base1/se.lu.thep.wenni/trunk/bin/nni/Makefile.am

    r853 r866  
    3131EXTRA_DIST = nni.h Parameter.h
    3232
    33 install-plugin: $(PROGRAMS)
    34   @echo Making $@
    35   test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
    36   @for i in $(PROGRAMS); do \
    37     ( echo "  $(INSTALL) $$i $(PLUGINDIR)" ; $(INSTALL) $$i $(PLUGINDIR) ) \
    38   done
     33install-plugin:
     34  $(MAKE) $(AM_MAKEFLAGS) bindir=$(PLUGINDIR) install
Note: See TracChangeset for help on using the changeset viewer.