From 600afc7ff1df3aedc69dd34d7a3d8c0a40b10a82 Mon Sep 17 00:00:00 2001
From: Reuben Thomas <rrt@sc3d.org>
Date: Sun, 9 Dec 2007 16:09:18 +0000
Subject: Remove autogen.sh and hence Makefile.am.in (becomes Makefile.am), and
 add a note about use of autoreconf to INSTALL.

---
 INSTALL        |  6 +++++-
 Makefile.am    | 32 ++++++++++++++++++++++++++++++++
 Makefile.am.in | 30 ------------------------------
 autogen.sh     |  9 ---------
 4 files changed, 37 insertions(+), 40 deletions(-)
 create mode 100644 Makefile.am
 delete mode 100644 Makefile.am.in
 delete mode 100644 autogen.sh

diff --git a/INSTALL b/INSTALL
index 39290b4..25c888f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -57,5 +57,9 @@ Basic Installation
  ldconfig after installation. Another option is to run configure
  with the option --prefix=/usr
 
+
+ To build from CVS, you will first need to run
+
+ autoreconf -i
+
 Have fun.
- -Fritz
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..1d84b9e
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,32 @@
+# $Id$
+#
+
+SUBDIRS = intl po lib ncpd plpnfsd plpfuse plpftp plpprint sisinstall doc .
+
+EXTRA_DIST = CHANGES COPYING README TODO HISTORY INSTALL ABOUT-NLS include/*.h* \
+	etc/*magic etc/*.in etc/*.c etc/psidump* etc/udev-usbserial-plptools.rules \
+	conf/m4/plptools/*.m4 conf/[a-l]* conf/missing conf/mkinstalldirs \
+	debian/*
+DISTCLEANFILES = etc/psion etc/psion.SuSE
+
+TMPDEST=
+
+install-data-local:
+	test "$(initdir)" != "none" && \
+		install -m 755 etc/psion $(DESTDIR)$(initdir)/psion || :
+
+dist-hook:
+	$(MAKE) TMPDEST=$(distdir)/ kdoc specfile
+	test -f CVS/Root && cvs2cl -W 1800 -S --no-wrap --prune \
+		--gmt -f $(distdir)/ChangeLog || \
+		cp -f ChangeLog $(distdir)/ChangeLog
+	rm -rf $(distdir)/debian/CVS
+
+kdoc:
+	kdoc -d $(TMPDEST)doc/api -n libplp --strip-h-path $(TMPDEST)lib/*.h
+
+specfile:
+	sed -e "s/\@VERSION\@/$(VERSION)/" < $(TMPDEST)etc/plptools.spec.in \
+		> $(TMPDEST)etc/plptools.spec
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/Makefile.am.in b/Makefile.am.in
deleted file mode 100644
index f14b899..0000000
--- a/Makefile.am.in
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-#
-
-SUBDIRS = intl po lib ncpd plpnfsd plpfuse plpftp plpprint sisinstall doc .
-
-EXTRA_DIST = CHANGES COPYING README TODO HISTORY INSTALL ABOUT-NLS include/*.h* \
-	etc/*magic etc/*.in etc/*.c etc/psidump* etc/udev-usbserial-plptools.rules \
-	conf/m4/plptools/*.m4 conf/[a-l]* conf/missing conf/mkinstalldirs \
-	debian/*
-DISTCLEANFILES = etc/psion etc/psion.SuSE
-
-TMPDEST=
-
-install-data-local:
-	test "$(initdir)" != "none" && \
-		install -m 755 etc/psion $(DESTDIR)$(initdir)/psion || :
-
-dist-hook:
-	$(MAKE) TMPDEST=$(distdir)/ kdoc specfile
-	test -f CVS/Root && cvs2cl -W 1800 -S --no-wrap --prune \
-		--gmt -f $(distdir)/ChangeLog || \
-		cp -f ChangeLog $(distdir)/ChangeLog
-	rm -rf $(distdir)/debian/CVS
-
-kdoc:
-	kdoc -d $(TMPDEST)doc/api -n libplp --strip-h-path $(TMPDEST)lib/*.h
-
-specfile:
-	sed -e "s/\@VERSION\@/$(VERSION)/" < $(TMPDEST)etc/plptools.spec.in \
-		> $(TMPDEST)etc/plptools.spec
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100644
index 44e95e7..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# Set up for compilation
-
-cp Makefile.am.in Makefile.am
-mkdir -p intl
-echo n | gettextize --force --intl --no-changelog
-test -e po/Makevars || cp po/Makevars.template po/Makevars
-rm -f *~
--test -f po/ChangeLog~ && mv -f po/ChangeLog~ po/ChangeLog
-autoreconf -i
-- 
cgit v1.2.3