--- Makefile.in	2004/03/03 23:37:58	1.10
+++ Makefile.in	2006/08/06 14:14:03	1.13.2.1
@@ -8,6 +8,7 @@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
 bindir = @bindir@
+datarootdir = @datarootdir@
 datadir = @datadir@
 libdir = @libdir@
 includedir = @includedir@
@@ -22,55 +23,55 @@
 @SET_MAKE@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
-UNINSTALL_PROGRAM = @UNINSTALL_PROGRAM@
 
 #### End of system configuration section. ####
 
 SHELL = /bin/sh
 
 all : force
-	cd @subdir@; $(MAKE) all
+	cd @subdir@ && $(MAKE) all
 
 install : installdirs force
-	cd @subdir@; $(MAKE) install
-	$(INSTALL_PROGRAM) cln-config $(DESTDIR)$(bindir)/cln-config
+	cd @subdir@ && $(MAKE) install
+	$(INSTALL_SCRIPT) cln-config $(DESTDIR)$(bindir)/cln-config
 	$(INSTALL_DATA) cln-config.1 $(DESTDIR)$(mandir)/man1/cln-config.1
 	$(INSTALL_DATA) ${srcdir}/cln.m4 ${DESTDIR}${datadir}/aclocal/cln.m4
 	$(INSTALL_DATA) cln.pc $(DESTDIR)$(libdir)/pkgconfig/cln.pc
 
 installdirs : force
-	cd @subdir@; $(MAKE) installdirs
+	cd @subdir@ && $(MAKE) installdirs
 	$(MKDIR) $(DESTDIR)$(mandir)/man1
 	$(MKDIR) $(DESTDIR)$(datadir)/aclocal
 	$(MKDIR) $(DESTDIR)$(bindir)
 	$(MKDIR) $(DESTDIR)$(libdir)/pkgconfig
 
 uninstall : force
-	cd @subdir@; $(MAKE) uninstall
+	cd @subdir@ && $(MAKE) uninstall
 	$(RM) $(DESTDIR)$(bindir)/cln-config
 	$(RM) $(DESTDIR)$(mandir)/man1/cln-config.1
 	$(RM) $(DESTDIR)$(datadir)/aclocal/cln.m4
 	$(RM) $(DESTDIR)$(libdir)/pkgconfig/cln.pc
 
 check : force
-	cd @subdir@; $(MAKE) check
+	cd @subdir@ && $(MAKE) check
 
 mostlyclean : force
-	cd @subdir@; $(MAKE) mostlyclean
+	cd @subdir@ && $(MAKE) mostlyclean
 
 clean : force
-	cd @subdir@; $(MAKE) clean
+	cd @subdir@ && $(MAKE) clean
 
 distclean : force
-	cd @subdir@; if test -f Makefile; then $(MAKE) distclean; fi
+	cd @subdir@ && if test -f Makefile; then $(MAKE) distclean; fi
 	$(RM) config.status config.log config.cache Makefile
-	$(RM) cln-config cln-config.1 cln.spec cln.pc
+	$(RM) cln-config cln-config.1 cln.pc
 	$(RM) libtool
 	$(RM) include/cln/config.h include/cln/intparam.h include/cln/floatparam.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h
 
 maintainer-clean : force
-	cd @subdir@; if test -f Makefile; then $(MAKE) maintainer-clean; fi
+	cd @subdir@ && if test -f Makefile; then $(MAKE) maintainer-clean; fi
 	$(RM) config.status config.log config.cache Makefile
 	$(RM) cln-config cln-config.1 cln.spec cln.pc
 	$(RM) libtool