--- a/Makefile.in
+++ b/Makefile.in
@@ -6,10 +6,10 @@
 
 # $Id$
 #
-# Copyright (C) 2006, 2007, 2008, Keith Marshall
+# Copyright (C) 2006, Keith Marshall
 #
 # Written by Keith Marshall  <keithmarshall@users.sourceforge.net>
-# Last modification: 15-Feb-2008
+# Last modification: 30-Dec-2006
 #
 #
 # This is free software.  It is provided AS IS, in the hope that it may
@@ -27,18 +27,14 @@
 # MA 02110-1301, USA.
 
 srcdir = @srcdir@
-VPATH = ${srcdir}:${srcdir}/include:${srcdir}/repl:${srcdir}/man
+VPATH = ${srcdir}:${srcdir}/include:${srcdir}/repl
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-canonical_prefix = @canonical_prefix@
-
 bindir = @bindir@
 libdir = @libdir@
-scriptdir = @datadir@/$(PACKAGE)/scripts
 includedir = @includedir@
-docdir = @datadir@/doc/$(PACKAGE)
 mandir = @mandir@
 
 CC = @CC@
@@ -89,108 +85,46 @@
 CATGETS_SOURCES = catopen.c catgets.c catclose.c mctab.c mcref.c mcfree.c
 CATGETS_OBJECTS = $(subst .c,.$(OBJEXT),$(CATGETS_SOURCES))
 
-GENCAT_HEADERS  = gencat.h gcmsgs.h mcutfsig.h
-GENCAT_SOURCES  = gencat.c mcload.c mcsource.c mciconv.c mcmerge.c mcutfsig.c
+GENCAT_HEADERS  = gencat.h gcmsgs.h
+GENCAT_SOURCES  = gencat.c mcload.c mcsource.c mciconv.c mcmerge.c
 GENCAT_OBJECTS  = @GENCAT_OBJECTS@
 
-OTHER_SOURCES   = $(DISTDOC_SOURCES) mkinstalldirs install-sh $(MISC_SOURCES)
-MISC_SOURCES	= $(CONFIG_HEADERS) $(CONFIG_SOURCES) $(DISTDEV_SCRIPTS)
-
-DISTDOC_SOURCES = ChangeLog COPYING FDL README
-MANPAGE_SOURCES	= catopen.man catgets.man catclose.man gencat.man
-
-# MANSECTS specifies the set of *standard* man section identifiers, to
-# which this collection of man pages will be distributed, or to which
-# references are made in any man page in the collection.
-#
-MANSECTS = 1 2 3
-
-# The set of MAN<n>EXT macros allows us to define local aliases for each
-# of the standard man section identifiers; these will be used instead of
-# the standard identifiers, as extensions for the installed man page
-# directories and file names.
-#
-MAN1EXT = 1
-MAN2EXT = 2
-MAN3EXT = 3
-
-# The following set of macros facilitate identification of the man
-# section to which each generated `page.n' file belongs; this requires
-# the `TH' record in each corresponding `page.man' source file to
-# identify the appropriate section with a `@MAN<n>EXT@' tag.
-#
-mansect_lookup = '/^\.TH/{s/.*\(@MAN[0-9][^@]*EXT@\).*/\1/'
-mansect_transform = $(foreach s,$(MANSECTS),-e s/@MAN$sEXT@/$(MAN$sEXT)/g)
-mansect = -e $(mansect_lookup) $(mansect_transform) -e q -e \} -e d
-manpage = ${mandir}/man$$section/$(man_prefix)$$pagename.$$section
-
-# Generic rule to create `page.n' from `page.man'...
-#
-%.n: %.man; sed $(mansect_transform) $< > $@
+OTHER_SOURCES   = COPYING ChangeLog mkinstalldirs install-sh $(MISC_SOURCES)
+MISC_SOURCES	= $(CONFIG_HEADERS) $(CONFIG_SOURCES) $(INSTALL_PROGS)
+
 
 BUILD_PROGS	= gencat$(EXEEXT)
 BUILD_LIBS	= libcatgets.a
 BUILD_DLLS	= catgets$(DLLVERSION).dll
 DLLVERSION	= @DLLVERSION@
 
-DISTDEV_SCRIPTS	= gendefs.awk
-
-# DISTDEV_SCRIPTS may not be directly runnable...
-# EXECDEV_SCRIPTS derives from them, creating variants with appropriate
-# shebang entries, making them directly executable from a command line.
-#
-EXECDEV_SCRIPTS = gendefs
-
-# Generic rule, replacing the built-in default, to create an object file
-# from a C source file...
-#
+INSTALL_PROGS	= gendefs.awk
+
 %.$(OBJEXT): %.c
 	$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFS) $(LDFLAGS) $<
 
-# Generic rule to create a local header from a template...
-#
 %.h: %.h.in Makefile
 	sed $(HEADER_TRANSFORM_SCRIPT) $< > $@
 
+%.h: repl/include/%.h
+	$(LN_S) $< $@
+
 HEADER_TRANSFORM_SCRIPT = \
-  -e 's,@HOST_PREFIX@,${canonical_prefix},g' \
+  -e 's,@HOST_PREFIX@,${prefix},g' \
   -e 's,@PATH_SEPARATOR_INTERNAL@,$(PATH_SEPARATOR_INTERNAL),g' \
   -e 's,$(subst .,\.,$@)\.in$$,$@ -- $(AUTOGENERATED),'
 
 AUTOGENERATED = Automatically generated from $<; do not edit!
 
-# Generic rule to make a replacement header available for use...
-#
-%.h: repl/include/%.h
-	$(LN_S) $< $@
-
-# Generic rule to make a runnable (shebanged) script,
-# from a non-runnable awk program script.
-#
-%: %.awk
-	sed '1s,!.*,! @AWK_INTERPRETER@ -f,' $< > $@
-	chmod 755 $@
-
 all-dll = @MAKE_DLL@
-all-targets = @MAKE_TARGETS@
-
-all: $(all-targets)
-
-all-native: all-libs $(all-dll) all-bin all-scripts all-doc
-all-cross-hosted: all-native cross-build
+
+all: all-libs $(all-dll) all-bin
 
 all-bin: $(BUILD_PROGS)
+
 all-dll: $(BUILD_DLLS)
+
 all-libs: $(BUILD_LIBS)
-all-scripts: $(EXECDEV_SCRIPTS)
-all-doc: all-man all-info all-htmldoc all-pdf all-ps
-all-man: $(subst .man,.n,$(MANPAGE_SOURCES))
-all-info:
-all-htmldoc:
-all-pdf:
-all-ps:
-
-all-cross-hosted-libs: all-libs $(all-dll)
 
 gencat$(EXEEXT): $(GENCAT_OBJECTS)
 	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBICONV) $(LIBS)
@@ -206,89 +140,49 @@
 
 $(GENCAT_OBJECTS): $(GENCAT_HEADERS) $(CATGETS_OBJECTS)
 
-FORCE:
-cross-build: FORCE; cd $@ && $(MAKE) all-cross-hosted-libs
-
 
 ## ============== ##
 ##  Installation  ##
 ## ============== ##
 
 mkinstalldirs = ${srcdir}/mkinstalldirs
-tool_prefix = @target_alias@`test -n "@target_alias@" && echo "-"`
+target = @target_alias@`test -n "@target_alias@" && echo "-"`
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 
 DLL_IMPORT_LIBNAME = lib`echo "$$dll" | sed 's?$(DLLVERSION).dll?.dll.a?'`
 
-install: install-$(all-targets)
-
-install-all-native: install-progs install-headers install-libs
-
-install-all-cross-hosted: install-progs
-	cd cross-build; $(MAKE) install-headers install-libs
-
-install-progs: install-bin-progs install-scripts
-
-install-bin-progs: $(BUILD_PROGS)
-	$(mkinstalldirs) --require ${exec_prefix} ${bindir}
-	for prog in $^; do \
-	  progname=`IFS='\\/'; set x $$prog; eval echo '$$'$$#`; \
-	  echo $(INSTALL_PROGRAM) $$prog ${bindir}/$(tool_prefix)$$progname; \
-	  $(INSTALL_PROGRAM) $$prog ${bindir}/$(tool_prefix)$$progname; \
-	done
-
-install-scripts: $(EXECDEV_SCRIPTS)
-	$(mkinstalldirs) --require ${prefix} ${scriptdir}
-	for script in $^; do \
-	  prog=`IFS='\\/'; set x $$script; eval echo '$$'$$#`; \
-	  echo $(INSTALL_SCRIPT) $$script ${scriptdir}/$(tool_prefix)$$prog; \
-	  $(INSTALL_SCRIPT) $$script ${scriptdir}/$(tool_prefix)$$prog; \
-	done
-
-install-dll: $(all-dll)
-	$(mkinstalldirs) --require ${exec_prefix} ${bindir}
+install: install-headers install-progs install-libs
+
+install-progs: all
+	$(mkinstalldirs) --require ${exec_prefix} ${bindir} ${libdir}
+	for prog in $(BUILD_PROGS); do \
+	  $(INSTALL_PROGRAM) $$prog ${bindir}/$(target)$$prog; \
+	done
+	for prog in $(INSTALL_PROGS); do \
+	  $(INSTALL_PROGRAM) ${srcdir}/$$prog ${bindir}/$(target)$$prog; \
+	done
+
+install-libs: all-libs $(all-dll)
 	test -z "$(all-dll)" || for dll in $(BUILD_DLLS); do \
-	  echo $(INSTALL_DATA) $$dll ${bindir}; \
 	  $(INSTALL_DATA) $$dll ${bindir}; \
-	done
-
-install-libs: all-libs $(all-dll)
-	$(mkinstalldirs) --require ${exec_prefix} ${bindir} ${libdir}
-	test -z "$(all-dll)" || for dll in $(BUILD_DLLS); do \
-	  echo $(INSTALL_DATA) $(DLL_IMPORT_LIBNAME) ${libdir}; \
 	  $(INSTALL_DATA) $(DLL_IMPORT_LIBNAME) ${libdir}; \
 	done
 	for lib in $(BUILD_LIBS); do \
-	  echo $(INSTALL_DATA) $$lib ${libdir}; \
 	  $(INSTALL_DATA) $$lib ${libdir}; \
 	done
 
 install-headers: $(REPLACEMENT_HEADERS)
 	$(mkinstalldirs) ${includedir}
 	test -z "$^" || for hdr in $^; do \
-	  echo $(INSTALL_DATA) $$hdr ${includedir}; \
 	  $(INSTALL_DATA) $$hdr ${includedir}; \
 	done
 
 install-doc: install-man install-info install-htmldoc install-pdf install-ps
 
-install-man: $(subst .man,.n,$(MANPAGE_SOURCES))
-	if test "${mandir}" = "${prefix}/man" \
-	|| test "${mandir}" = "${prefix}/share/man"; then \
-	  $(mkinstalldirs) --require ${prefix} ${mandir}; \
-	fi
-	for file in $^; do \
-	  pagename=`echo $$file | sed 's/\.n//'`; \
-	  section=`sed $(mansect) ${srcdir}/man/$$pagename.man`; \
-	  $(mkinstalldirs) --require ${mandir} ${mandir}/man$$section; \
-	  echo $(INSTALL_DATA) $$file $(manpage); \
-	  $(INSTALL_DATA) $$file $(manpage); \
-	done
-
+install-man:
 install-info:
 install-htmldoc:
 install-pdf:
@@ -299,15 +193,12 @@
 ##  Distribution  ##
 ## ============== ##
 
-dist: srcdist bindist devdist
+dist: srcdist bindist
 dist_srcdir = @abs_top_srcdir@
 
-DISTDIRS = include m4 repl repl/include man
+DISTDIRS = include m4 repl repl/include
 DISTFILES = $(GENCAT_SOURCES) $(CATGETS_SOURCES) $(OTHER_SOURCES)
-DISTNAME = $(PACKAGE)-$(VERSION)$(SNAPSHOT)
-
-bindist-tag = bin
-devdist-tag = dev
+DISTNAME = $(PACKAGE)-$(VERSION)
 
 ZIP = gzip -c
 ZIPTYPE = tar.gz
@@ -327,52 +218,21 @@
 	tar chf - $(DISTNAME) | $(ZIP) > $(DISTNAME)-src.$(ZIPTYPE)
 	rm -rf $(DISTNAME)
 
-bindist devdist: all
+bindist: all
 	rm -rf tmp; mkdir tmp
-	$(MAKE) prefix=`pwd`/tmp $@-install
-	cd tmp && tar chf - * | $(ZIP) > ../$(DISTNAME)-$($@-tag).$(ZIPTYPE)
+	$(MAKE) prefix=`pwd`/tmp install-progs install-libs install-doc
+	cd tmp && tar chf - * | $(ZIP) > ../$(DISTNAME)-bin.$(ZIPTYPE)
 	rm -rf tmp
-
-bindist-install: bindist-docs-install install-dll
-devdist-install: devdist-docs-install devdist-headers-install
-devdist-install: install-progs install-libs install-doc
-
-bindist-docs-install: README COPYING
-	$(mkinstalldirs) ${docdir}
-	for file in $^; do \
-	  echo $(INSTALL_DATA) $$file ${docdir}; \
-	  $(INSTALL_DATA) $$file ${docdir}; \
-	done
-
-devdist-docs-install: bindist-docs-install devdist-extra-docs-install
-
-devdist-extra-docs-install: FDL
-	for file in $^; do \
-	  echo $(INSTALL_DATA) $$file ${docdir}; \
-	  $(INSTALL_DATA) $$file ${docdir}; \
-	done
-
-devdist-headers-install: nl_types.h langinfo.h
-	$(mkinstalldirs) ${includedir}
-	for file in $^; do \
-	  echo $(INSTALL_DATA) $$file ${includedir}; \
-	  $(INSTALL_DATA) $$file ${includedir}; \
-	done
 
 
 ## ========== ##
 ##  Clean Up  ##
 ## ========== ##
 
-clean: FORCE
-	if test -d cross-build; then cd cross-build; $(MAKE) $@; fi
-	rm -f nlspath.h $(LOCAL_HEADERS) $(REPLACEMENT_HEADERS)
-	rm -f *.$(OBJEXT) *~ gencat$(EXEEXT) $(EXECDEV_SCRIPTS) *.n *.a *.dll
-
-distclean: distclean-cross-hosted clean
+clean:
+	rm -f *.$(OBJEXT) *~ gencat$(EXEEXT)
+
+distclean: clean
 	rm -rf Makefile config.h config.[ls]* autom4te.cache
 
-distclean-cross-hosted: FORCE
-	rm -rf cross-build
-
-# $RCSfile$Revision: 1.7 $: end of file
+# $RCSfile$Revision$: end of file