Merge branch 'upstream'

1 files changed, 38 insertions, 78 deletions

diff --git a/Makefile.in b/Makefile.in
index f70d2ff..c57e4cf 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 
 # Makefile to install foomatic-filters
-# $Revision: 3.4.2.6 $
+# $Revision: 3.4.2.7 $
 
 # PREFIX defaults to /usr/local for manually installed progs, so that they
 # are not messed up on a system upgrade.
@@ -42,93 +42,70 @@ PPR_INTERFACES=@PPR_INTERFACES@
 PPR_LIB=@PPR_LIB@
 
 # This is mainly useful for building a binary foomatic package
-DESTDIR=
+#DESTDIR=
 
 ### Probably nothing to fiddle past here
 
 # Files generated by the AC_OUTPUT call of "./configure"
-AC_OUTPUT_FILES:=Makefile makeMan foomatic-gswrapper \
-	foomatic-rip beh
+AC_OUTPUT_FILES=Makefile foomatic-gswrapper foomatic-rip beh \
+		foomatic-gswrapper.1 foomatic-rip.1
 
 # User programs and helper programs
-BINFILES:=foomatic-gswrapper foomatic-rip
-
-# Filters, only useful for admins
-SBINFILES:=
+BINFILES=foomatic-gswrapper foomatic-rip
 
 # Masks for trash files which have to be removed before packaging Foomatic
-TRASHFILES:="*~" "*\#*" ".??*" "*.rej"
+TRASHFILES="*~" "*\#*" ".??*" "*.rej"
+
+$(BINFILES):
+	@echo "please run \"./configure\" to generate the bits"
+	exit 1
 
-all: build
+all: $(BINFILES)
 
 # The install rule should check for kitloads and avoid stomping.  It doesn't
 install: install-main install-cups install-ppr
 
-install-main: install-bin install-man install-etc
-
-check-config:
-	@if [ -f .testing-stamp ] ; then \
-	  echo 'Cowardly refusing to install inplace-built filters.' ;\
-	  echo 'Use "make inplace_clean; make" to get proper ones.' ;\
-	  exit 1 ;\
-	fi
+install-main: install-bin install-man
 
-install-cups: check-config
+install-cups:	install-bin
 	${SRC}/mkinstalldirs $(DESTDIR)$(CUPS_FILTERS)
 	${SRC}/mkinstalldirs $(DESTDIR)$(CUPS_BACKENDS)
 	ln -sf $(BINDIR)/foomatic-rip $(DESTDIR)$(CUPS_FILTERS)
 	${INSTALL} -m 755 beh $(DESTDIR)$(CUPS_BACKENDS)
 
-install-ppr: check-config
+install-ppr:	install-bin
 	${SRC}/mkinstalldirs $(DESTDIR)$(PPR_INTERFACES)
 	${SRC}/mkinstalldirs $(DESTDIR)$(PPR_LIB)
 	ln -sf $(BINDIR)/foomatic-rip $(DESTDIR)$(PPR_INTERFACES)
 	ln -sf $(BINDIR)/foomatic-rip $(DESTDIR)$(PPR_LIB)
 
-install-bin: check-config
+install-bin:	install-etc
 	${SRC}/mkinstalldirs $(DESTDIR)$(BINDIR)
-	${INSTALL} -m 755 $(BINFILES) $(DESTDIR)$(BINDIR)
-#	${INSTALL} -m 755 $(SBINFILES) $(DESTDIR)$(SBINDIR)
+	(for FILE in $(BINFILES) ; do \
+		${INSTALL} -m 755 $$FILE $(DESTDIR)$(BINDIR) ; done)
 
-install-etc: check-config
+install-etc:
 	${SRC}/mkinstalldirs $(DESTDIR)$(ETCDIR)/direct
 	${INSTALL} -m 644 ${SRC}/filter.conf $(DESTDIR)$(ETCDIR)/filter.conf.sample
 	if [ ! -f  $(DESTDIR)$(ETCDIR)/filter.conf ] ; then ${INSTALL} -m 644 ${SRC}/filter.conf $(DESTDIR)$(ETCDIR); fi;
 
-install-man: check-config
+install-man:
 	${SRC}/mkinstalldirs $(DESTDIR)$(MANDIR)
 	${SRC}/mkinstalldirs $(DESTDIR)$(MANDIR)/man1
-#	${SRC}/mkinstalldirs $(DESTDIR)$(MANDIR)/man8
-	${INSTALL} -m 644 *.1 $(DESTDIR)$(MANDIR)/man1
-#	cp -f *.8 $(DESTDIR)$(MANDIR)/man8
-
-build:  man
-	chmod a+rx foomatic-rip foomatic-gswrapper beh
-
-man:
-	chmod a+rx ./makeMan
-	if [ "$(INPLACE)" = "--inplace" ]; then \
-	  FOOMATIC_RIP=`pwd`/foomatic-rip; \
-	  FOO_ETC=`pwd`/etc/foomatic; \
-	  PRINTCAP=@PRINTCAP@; \
-	else \
-	  FOOMATIC_RIP=$(BINDIR)/foomatic-rip; \
-	  FOO_ETC=$(ETCDIR); \
-	  PRINTCAP=@PRINTCAP@; \
-	fi; \
-	export FOOMATIC_RIP FOO_ETC PRINTCAP; \
-	./makeMan ${SRC}/*[0-9].in
+	(for FILE in *.1 ; do \
+		${INSTALL} -m 444 $$FILE $(DESTDIR)$(MANDIR)/man1 ; done)
 
 # Clean up the source directory
-clean: remove-trash
+clean:	remove-trash
 	rm -f .testing-stamp
-	rm -f $(BINFILES:=.1) $(SBINFILES:=.8) test/*.out
+	rm -f test/*.out
 
-distclean: clean
+distclean:	clean
 	rm -f $(AC_OUTPUT_FILES) config.log config.status config.cache configure.lineno
 	rm -rf autom*.cache confdefs.h
+	rm -f tests/Makefile
 
-maintainer-clean: distclean
+maintainer-clean:	distclean
 	rm -f configure aclocal.m4
 
 # Remove editor backup and temporary files
@@ -139,62 +116,45 @@ remove-trash:
 
 # Uninstall an installed Foomatic
 
-uninstall: uninstall-cups uninstall-ppr uninstall-main
+uninstall:	uninstall-cups uninstall-ppr uninstall-main
 
-uninstall-main: uninstall-bin uninstall-man
+uninstall-main:	uninstall-bin uninstall-man
 
-uninstall-bin: check-config
+uninstall-bin:
 	( cd $(DESTDIR)$(BINDIR) && \
 	  rm -f $(BINFILES) \
 	)
-#	( cd $(DESTDIR)$(SBINDIR) && \
-#	  rm -f $(SBINFILES) \
-#	)
 
-uninstall-etc: check-config
+uninstall-etc:
 	rm -f $(DESTDIR)$(ETCDIR)/filter.conf
 	rm -f $(DESTDIR)$(ETCDIR)/filter.conf.sample
 	rmdir $(DESTDIR)$(ETCDIR)/direct || :
 	rmdir $(DESTDIR)$(ETCDIR) || :
 
-uninstall-cups: check-config
+uninstall-cups:
 	rm -f $(DESTDIR)$(CUPS_FILTERS)/foomatic-rip
 	rm -f $(DESTDIR)$(CUPS_BACKENDS)/beh
 	rmdir $(DESTDIR)$(CUPS_FILTERS) || :
 	rmdir $(DESTDIR)$(CUPS_BACKENDS) || :
 	rmdir $(DESTDIR)$(CUPS) || :
 
-uninstall-ppr: check-config
+uninstall-ppr:
 	rm -f $(DESTDIR)$(PPR_INTERFACES)/foomatic-rip
 	rmdir $(DESTDIR)$(PPR_INTERFACES) || :
 	rm -f $(DESTDIR)$(PPR_LIB)/foomatic-rip
 	rmdir $(DESTDIR)$(PPR_LIB) || :
 	rmdir $(DESTDIR)$(PPR) || :
 
-uninstall-man: check-config
+uninstall-man:	check-config
 	for m in $(BINFILES); do \
 	  rm -f $(DESTDIR)$(MANDIR)/man1/$$m.*; \
 	done
-#	for m in $(SBINFILES); do \
-#	  rm -f $(DESTDIR)$(MANDIR)/man8/$$m.*; \
-#	done
 
 # Various testing/debugging/etc targets
-inplace: testing
-testing: INPLACE = --inplace
-testing: build
-	touch .testing-stamp
-
-inplace-clean: testing_clean
-testing-clean: clean
-
-# We need to export all Variables for makeDefaults and the scripts target to
-# work.
-.EXPORT_ALL_VARIABLES:
-
-# Use INPLACE=--inplace to get the special run-in-place Defaults.
+inplace:	all
+	chmod a+rx $(BINFILES)
 
-.PHONY: all check-config build install install-bin \
-	man inplace testing clean inplace-clean testing-clean distclean \
-	maintainer-clean
+testing tests:	inplace
+	cd tests ; $(MAKE)
 
+.PHONY:	all install install-bin clean distclean maintainer-clean tests inplace