OSSP CVS Repository

ossp - Check-in [5620]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 5620
Date: 2006-Jul-31 19:32:29 (local)
2006-Jul-31 17:32:29 (UTC)
User:rse
Branch:
Comment: Fix "make install": the executable "js" was not installed via GNU libtool and this way under --enable-shared the wrapper script was installed only.

Submitted by: Alfred Reibenschuh <alfred.reibenschuh@it-austria.com>

Tickets:
#116 make install installs libtool wrapper-script instead of js binary
Inspections:
Files:
ossp-pkg/js/ChangeLog      1.21 -> 1.22     5 inserted, 0 deleted
ossp-pkg/js/Makefile.in      1.24 -> 1.25     3 inserted, 3 deleted

ossp-pkg/js/ChangeLog 1.21 -> 1.22

--- ChangeLog    2006/07/31 17:31:30     1.21
+++ ChangeLog    2006/07/31 17:32:29     1.22
@@ -13,6 +13,11 @@
 
   Changes between 1.6.20060730 and 1.6.20060801 (2006-07-30 to 2006-08-01)
 
+   o Fix "make install": the executable "js" was not installed via GNU
+     libtool and this way under --enable-shared the wrapper script was
+     installed only.
+     [Alfred Reibenschuh <alfred.reibenschuh@it-austria.com>]
+
    o Add a src/perlconnect/MANIFEST file to make ExtUtils::MakeMaker more happy.
      [Ralf S. Engelschall <rse@engelschall.com>]
 


ossp-pkg/js/Makefile.in 1.24 -> 1.25

--- Makefile.in  2006/07/31 17:21:48     1.24
+++ Makefile.in  2006/07/31 17:32:29     1.25
@@ -181,15 +181,15 @@
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)/js
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)/pkgconfig
-        $(SHTOOL) install -c -m 755 js $(DESTDIR)$(bindir)/
-        $(SHTOOL) install -e 's;#!\./js;#!$(bindir)/js;' -c -m 755 jslint.js $(DESTDIR)$(bindir)/jslint
         $(SHTOOL) install -c -m 644 js.1 $(DESTDIR)$(mandir)/man1/
         $(SHTOOL) install -c -m 644 js-config.1 $(DESTDIR)$(mandir)/man1/
         $(SHTOOL) install -c -m 644 js.3 $(DESTDIR)$(mandir)/man3/
         $(SHTOOL) install -c -m 644 src/js*.h $(DESTDIR)$(includedir)/js/
         @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/
-        $(SHTOOL) install -c -m 755 js-config.sh $(DESTDIR)$(bindir)/js-config
         $(SHTOOL) install -c -m 644 js.pc $(DESTDIR)$(libdir)/pkgconfig/
+        $(SHTOOL) install -c -m 755 js-config.sh $(DESTDIR)$(bindir)/js-config
+        @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 js $(DESTDIR)$(bindir)/
+        $(SHTOOL) install -e 's;#!\./js;#!$(bindir)/js;' -c -m 755 jslint.js $(DESTDIR)$(bindir)/jslint
         @if [ ".$(WITH_PERL)" = ".yes" ]; then \
             (cd src/perlconnect; $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \
         fi

CVSTrac 2.0.1