OSSP CVS Repository

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

Check-in Number: 5623
Date: 2006-Jul-31 20:09:45 (local)
2006-Jul-31 18:09:45 (UTC)
User:rse
Branch:
Comment: Fix "make distclean": src/perlconnect/Makefile.PL is always generated and hence has to be always deleted.
Tickets:
Inspections:
Files:
ossp-pkg/js/ChangeLog      1.24 -> 1.25     4 inserted, 0 deleted
ossp-pkg/js/Makefile.in      1.25 -> 1.26     9 inserted, 2 deleted

ossp-pkg/js/ChangeLog 1.24 -> 1.25

--- ChangeLog    2006/07/31 17:44:29     1.24
+++ ChangeLog    2006/07/31 18:09:45     1.25
@@ -13,6 +13,10 @@
 
   Changes between 1.6.20060730 and 1.6.20060731 (2006-07-30 to 2006-07-31)
 
+   o Fix "make distclean": src/perlconnect/Makefile.PL is always generated
+     and hence has to be always deleted.
+     [Ralf S. Engelschall <rse@engelschall.com>]
+
    o Fix "devtool dist" command: "make man" does not exist.
      [Ralf S. Engelschall <rse@engelschall.com>]
 


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

--- Makefile.in  2006/07/31 17:32:29     1.25
+++ Makefile.in  2006/07/31 18:09:45     1.26
@@ -202,15 +202,22 @@
         -$(RM) -r src/.libs src/fdlibm/.libs >/dev/null 2>&1 || $(TRUE)
         -$(RM) *.o *.lo
         @if [ ".$(WITH_PERL)" = ".yes" ]; then \
-            (cd src/perlconnect; $(MAKE) $(MFLAGS) clean || $(TRUE); mv Makefile.old Makefile || $(TRUE)); \
+            ( cd src/perlconnect; \
+              if [ -f Makefile ]; then $(MAKE) $(MFLAGS) clean || $(TRUE); fi; \
+              if [ -f Makefile.old ]; then mv Makefile.old Makefile; fi; \
+            ); \
         fi
 
 distclean: clean
         -$(RM) config.log config.status config.cache
         -$(RM) Makefile config.h js.pc js-config.sh
         -$(RM) libtool
+        -$(RM) src/perlconnect/Makefile.PL
         @if [ ".$(WITH_PERL)" = ".yes" ]; then \
-            (cd src/perlconnect; $(MAKE) $(MFLAGS) distclean || $(TRUE); $(RM) -f Makefile.PL Makefile Makefile.old); \
+            ( cd src/perlconnect; \
+              if [ -f Makefile ]; then $(MAKE) $(MFLAGS) distclean || $(TRUE); fi; \
+              $(RM) -f Makefile Makefile.old || $(TRUE); \
+            ); \
         fi
 
 realclean: distclean

CVSTrac 2.0.1