From 3ecaca0cc17dc07843b3b65466419930123bf281 Mon Sep 17 00:00:00 2001
From: sam <sam@55e467fa-43c5-0310-a8a2-de718669efc6>
Date: Mon, 25 Aug 2003 12:20:01 +0000
Subject: [PATCH]   * Fixed the Debian package build. It now uses ./configure.

git-svn-id: svn://svn.zoy.org/elk/trunk@28 55e467fa-43c5-0310-a8a2-de718669efc6
---
 configure.ac       |  2 +-
 debian/changelog   |  2 +-
 debian/dirs        |  2 +-
 debian/elkdoc.docs |  2 +-
 debian/rules       | 26 ++++++++++++++++----------
 lib/xaw/build      |  4 ++--
 lib/xm/build       |  4 ++--
 7 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 060d3f9..4f0bc46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(cfingerd, 1.5.0)
+AM_INIT_AUTOMAKE(elk, 3.99.0)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/debian/changelog b/debian/changelog
index e6f86fc..981695a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-elk (3.99-1) unstable; urgency=low
+elk (3.99.0-1) unstable; urgency=low
 
   * Pending release.
 
diff --git a/debian/dirs b/debian/dirs
index 73752c9..8898ca7 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1 @@
-usr
+usr/share/elk
diff --git a/debian/elkdoc.docs b/debian/elkdoc.docs
index f75b618..5508ed4 100644
--- a/debian/elkdoc.docs
+++ b/debian/elkdoc.docs
@@ -1,5 +1,5 @@
 BUGS
-CONTRIBUTORS
+AUTHORS
 MIGRATE
 MACHINES
 README
diff --git a/debian/rules b/debian/rules
index d7d8fa6..fe592fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,19 +12,26 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-build: build-stamp
-build-stamp:
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
 
-	$(MAKE) SUBDIRS='include scripts src scm lib/misc lib/unix\
-	 lib/xlib lib/xt lib/xaw lib/xm lib/xm/xt'
+	./configure --prefix=/usr
+
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+
+	$(MAKE)
 
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp configure-stamp
 
 	-$(MAKE) -i distclean
 
@@ -39,8 +46,6 @@ install: build
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/elk
 
-	mv $(CURDIR)/debian/elk/usr/bin/scheme \
-	   $(CURDIR)/debian/elk/usr/bin/scheme-elk
 	install -m 644 debian/elk.ini $(CURDIR)/debian/elk/usr/share/elk
 
 	mv $(CURDIR)/debian/elk/usr/lib/*.so.* \
@@ -49,6 +54,7 @@ install: build
 	mv $(CURDIR)/debian/elk/usr/include/elk/* \
 	   $(CURDIR)/debian/libelk0-dev/usr/include/elk/
 	mv $(CURDIR)/debian/elk/usr/lib/*.so \
+	   $(CURDIR)/debian/elk/usr/lib/*.la \
 	   $(CURDIR)/debian/elk/usr/lib/*.a \
 	   $(CURDIR)/debian/libelk0-dev/usr/lib/
 
@@ -70,7 +76,7 @@ binary-indep: build install
 #	dh_installmanpages
 #	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs CHANGES
+	dh_installchangelogs NEWS
 #	dh_link
 	dh_compress
 	dh_fixperms
@@ -98,9 +104,9 @@ binary-arch: build install
 	dh_installman
 #	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs CHANGES
+	dh_installchangelogs NEWS
 	dh_strip
-	dh_link usr/bin/scheme-elk usr/bin/elk
+	dh_link usr/bin/elk usr/bin/scheme-elk
 	dh_compress
 	dh_fixperms
 	dh_installdeb
diff --git a/lib/xaw/build b/lib/xaw/build
index ac41d2f..b254c68 100755
--- a/lib/xaw/build
+++ b/lib/xaw/build
@@ -86,10 +86,10 @@ WIDGET_SET= xaw
 	../../scripts/makedl \$@ \$@
 
 .d.c:
-	LD_LIBRARY_PATH=../../src ../../src/scheme \$(SCMFLAGS) -l mkwidget.scm \$< \$@ \$(WIDGET_SET)
+	LD_LIBRARY_PATH=../../src ../../src/elk \$(SCMFLAGS) -l mkwidget.scm \$< \$@ \$(WIDGET_SET)
 
 .d.o:
-	LD_LIBRARY_PATH=../../src ../../src/scheme \$(SCMFLAGS) -l mkwidget.scm \$< \$*.c \$(WIDGET_SET)
+	LD_LIBRARY_PATH=../../src ../../src/elk \$(SCMFLAGS) -l mkwidget.scm \$< \$*.c \$(WIDGET_SET)
 	\$(CC) \$(CFLAGS) -I\$(INC) -I../xlib $x11_incl -c \$*.c
 	../../scripts/makedl \$@ \$@
 
diff --git a/lib/xm/build b/lib/xm/build
index 5d7806b..bdc46fa 100755
--- a/lib/xm/build
+++ b/lib/xm/build
@@ -92,10 +92,10 @@ WIDGET_SET= xm
 	../../scripts/makedl \$@ \$@
 
 .d.c:
-	LD_LIBRARY_PATH=../../src ../../src/scheme \$(SCMFLAGS) -l mkwidget.scm \$< \$@ \$(WIDGET_SET)
+	LD_LIBRARY_PATH=../../src ../../src/elk \$(SCMFLAGS) -l mkwidget.scm \$< \$@ \$(WIDGET_SET)
 
 .d.o:
-	LD_LIBRARY_PATH=../../src ../../src/scheme \$(SCMFLAGS) -l mkwidget.scm \$< \$*.c \$(WIDGET_SET)
+	LD_LIBRARY_PATH=../../src ../../src/elk \$(SCMFLAGS) -l mkwidget.scm \$< \$*.c \$(WIDGET_SET)
 	\$(CC) \$(CFLAGS) -I\$(INC) -I../xlib $sys_incl -c \$*.c
 	../../scripts/makedl \$@ \$@