Index: Makefile.in
===================================================================
RCS file: /home/cvs/debian/fetchmail/Makefile.in,v
retrieving revision 1.1.1.17
retrieving revision 1.17
diff -u -r1.1.1.17 -r1.17
--- Makefile.in	2001/04/10 20:47:15	1.1.1.17
+++ Makefile.in	2001/04/15 22:51:22	1.17
@@ -27,6 +27,11 @@
 CPFLAGS = @CPFLAGS@
 LDEFLAGS = @LDEFLAGS@
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 # for gettext (used by fetchmail.c, NOT by GNU gettext)
 localedir = $(datadir)/locale
 
@@ -50,7 +55,7 @@
 # Extra sources/objects for library functions not provided on the host system.
 EXTRASRC = @EXTRASRC@
 # EXTRASRC = $(srcdir)/strcasecmp.c $(srcdir)/getopt.c $(srcdir)/getopt1.c $(srcdir)/alloca.c	# QNX
-EXTRAOBJ = @EXTRAOBJ@ @INTLOBJS@
+EXTRAOBJ = @EXTRAOBJ@
 # EXTRAOBJ = strcasecmp.o getopt.o getopt1.o alloca.o
 
 DESTDIR = 
@@ -122,15 +127,14 @@
 # Some makes apparently use .PHONY as the default goal if it is before `all'.
 .PHONY: all
 
-fetchmail: $(objs) @INTLDEPS@
+fetchmail: intl $(objs)
 	$(CC) $(LDEFLAGS) $(LDFLAGS) $(objs) $(LOADLIBS) -o fetchmail
 
-intl:
-(_at_)INTLDEPS@:	dummy
-	$(MAKE) -C intl
+intl:	dummy
+	(cd intl && $(MAKE) )
 
 po:	dummy
-	$(MAKE) -C po
+	(cd po && $(MAKE) )
 
 dummy:
 
@@ -173,29 +177,29 @@
 	rm -f $(DESTDIR)$(mandir)/fetchmailconf.$(manext)
 	cd $(DESTDIR)$(mandir) && ln -s fetchmail.$(manext) fetchmailconf.$(manext)
 	@echo "Installing language catalogs..."
-	-$(MAKE) -C intl install
-	$(MAKE) -C po install
+	-(cd intl && $(MAKE) install )
+	(cd po && $(MAKE) install )
 
 uninstall:
 	rm -f $(DESTDIR)$(bindir)/fetchmail $(DESTDIR)$(bindir)/fetchmailconf
 	rm -f $(DESTDIR)$(mandir)/fetchmail.$(manext) $(DESTDIR)$(mandir)/fetchmailconf.$(manext)
-	-$(MAKE) -C intl uninstall
-	$(MAKE) -C po uninstall
+	-(cd intl && $(MAKE) uninstall )
+	(cd po && $(MAKE) uninstall )
 
 .PHONY: clean realclean distclean mostlyclean
 clean: 
-	-$(MAKE) -C intl clean
+	-(cd intl && $(MAKE) clean )
 	#work around braindamage in GNU gettext
 	-rm -f intl/libintl.h
-	-$(MAKE) -C po clean
+	-(cd po && $(MAKE) clean )
 	-rm -f fetchmail *.o core fetchmail.dvi \
 	       rcfile_l.c rcfile_y.h rcfile_y.c \
 	       fetchmail.tar fetchmail.tar.gz \
 	       netrc rfc822 unmime fetchmail-man.html
 
 distclean: clean 
-	-$(MAKE) -C intl distclean
-	-$(MAKE) -C po distclean
+	-(cd intl && $(MAKE) distclean )
+	-(cd po && $(MAKE) distclean )
 	-rm -f TAGS tags
 	# Can't do these, it messes up RPM build
 	#-rm -f config.h config.cache config.status config.log stamp-config
@@ -212,27 +216,30 @@
 # one below is unnecessary and causes problems with cross-platform builds.
 
 ${srcdir}/configure: configure.in aclocal.m4
-	cd ${srcdir} && @AUTOCONF@
-     
+	cd ${srcdir} && $(AUTOCONF)
 # autoheader might not change config.h.in, so touch a stamp file.
 ${srcdir}/config.h.in: stamp-h.in
-
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/stamp-h.in; \
+		$(MAKE) $(srcdir)/stamp-h.in; \
+	else :; fi
 ${srcdir}/stamp-h.in: configure.in aclocal.m4 acconfig.h # config.h.top config.h.bot
-	cd ${srcdir} # && @AUTOHEADER@
+	cd ${srcdir} # && $(AUTOHEADER)
 	echo timestamp> ${srcdir}/stamp-h.in
-     
 config.h: stamp-h
+	@if test ! -f $@; then \
+		rm -f stamp-h; \
+		$(MAKE) stamp-h; \
+	else :; fi
 stamp-h: config.h.in config.status
 	./config.status
-     
+	@echo timestamp > stamp-h 2> /dev/null
 Makefile: Makefile.in config.status
 	./config.status
-     
 config.status: configure
 	./config.status --recheck
-
 $(srcdir)/aclocal.m4: configure.in
-	cd $(srcdir) && @ACLOCAL@
+	cd $(srcdir) && $(ACLOCAL)
 
 # This tells versions [3.59,3.63) of GNU make not to export all variables.
 .NOEXPORT: