Changeset f247f915f033740c1c940f66d67bbafff9fdee9a

Show
Ignore:
Timestamp:
12/19/11 03:37:19 (2 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1324265839 -0500
git-parent:

[14e10b9e7dab49aac75cff3eff6183cf9be2c8ce]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1324265839 -0500
Message:

put all the jars in the javadir directly

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/java/Makefile.in

    r24c830d rf247f91  
    111111install-dirs:   all 
    112112        $(top_srcdir)/buildtools/mkinstalldirs $(DESTDIR)$(javalibdir) 
    113         $(top_srcdir)/buildtools/mkinstalldirs $(DESTDIR)$(javalibdir)/lib 
    114113        $(top_srcdir)/buildtools/mkinstalldirs $(DESTDIR)$(bindir) 
    115114 
    …… 
    118117        $(INSTALL) -m 0644 reconnoiter.jar $(DESTDIR)$(javalibdir)/reconnoiter.jar 
    119118        for jar in $(R_SUPPORT) ; do \ 
    120                 $(INSTALL) -m 0644 $$jar $(DESTDIR)$(javalibdir)/$$jar ; \ 
     119                $(INSTALL) -m 0644 $$jar $(DESTDIR)$(javalibdir)/`echo $$jar | sed -e 's#^lib/##'` ; \ 
    121120        done 
    122121        $(INSTALL) -m 0755 run-iep.sh $(DESTDIR)$(bindir)/run-iep.sh 
    …… 
    126125        $(INSTALL) -m 0644 jezebel.jar $(DESTDIR)$(javalibdir)/jezebel.jar 
    127126        for jar in $(J_SUPPORT) ; do \ 
    128                 $(INSTALL) -m 0644 $$jar $(DESTDIR)$(javalibdir)/$$jar ; \ 
     127                $(INSTALL) -m 0644 $$jar $(DESTDIR)$(javalibdir)/`echo $$jar | sed -e 's#^lib/##'` ; \ 
    129128        done 
    130129        $(INSTALL) -m 0755 jezebel $(DESTDIR)$(bindir)/jezebel 

  • src/java/run-iep.sh.in

    r14e10b9 rf247f91  
    2121        commons-codec-1.5.jar protobuf-java-2.4.1.jar" 
    2222 
    23 DIRS=". lib @prefix@/java/lib @prefix@/java" 
     23DIRS=". lib @prefix@/java" 
    2424CP= 
    2525