conservatory
/
elk
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Fixed the Debian package build. It now uses ./configure. 

git-svn-id: svn://svn.zoy.org/elk/trunk@28 55e467fa-43c5-0310-a8a2-de718669efc6
This commit is contained in:
sam 2003-08-25 12:20:01 +00:00
parent 29a24afc32
commit 3ecaca0cc1
7 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -4,7 +4,7 @@ AC_PREREQ(2.50)
AC_CONFIG_AUX_DIR(autotools) AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(cfingerd, 1.5.0) AM_INIT_AUTOMAKE(elk, 3.99.0)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AC_PROG_CC AC_PROG_CC

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
elk (3.99-1) unstable; urgency=low elk (3.99.0-1) unstable; urgency=low
* Pending release. * Pending release.

2
debian/dirs vendored
View File

@ -1 +1 @@
usr usr/share/elk

2
debian/elkdoc.docs vendored
View File

@ -1,5 +1,5 @@
BUGS BUGS
CONTRIBUTORS AUTHORS
MIGRATE MIGRATE
MACHINES MACHINES
README README

26
debian/rules vendored
View File

@ -12,19 +12,26 @@
# This has to be exported to make some magic below work. # This has to be exported to make some magic below work.
export DH_OPTIONS export DH_OPTIONS
build: build-stamp configure: configure-stamp
build-stamp: configure-stamp:
dh_testdir dh_testdir
$(MAKE) SUBDIRS='include scripts src scm lib/misc lib/unix\ ./configure --prefix=/usr
lib/xlib lib/xt lib/xaw lib/xm lib/xm/xt'
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch build-stamp touch build-stamp
clean: clean:
dh_testdir dh_testdir
dh_testroot dh_testroot
rm -f build-stamp rm -f build-stamp configure-stamp
-$(MAKE) -i distclean -$(MAKE) -i distclean
@ -39,8 +46,6 @@ install: build
$(MAKE) install DESTDIR=$(CURDIR)/debian/elk $(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 install -m 644 debian/elk.ini $(CURDIR)/debian/elk/usr/share/elk
mv $(CURDIR)/debian/elk/usr/lib/*.so.* \ mv $(CURDIR)/debian/elk/usr/lib/*.so.* \
@ -49,6 +54,7 @@ install: build
mv $(CURDIR)/debian/elk/usr/include/elk/* \ mv $(CURDIR)/debian/elk/usr/include/elk/* \
$(CURDIR)/debian/libelk0-dev/usr/include/elk/ $(CURDIR)/debian/libelk0-dev/usr/include/elk/
mv $(CURDIR)/debian/elk/usr/lib/*.so \ mv $(CURDIR)/debian/elk/usr/lib/*.so \
$(CURDIR)/debian/elk/usr/lib/*.la \
$(CURDIR)/debian/elk/usr/lib/*.a \ $(CURDIR)/debian/elk/usr/lib/*.a \
$(CURDIR)/debian/libelk0-dev/usr/lib/ $(CURDIR)/debian/libelk0-dev/usr/lib/
@ -70,7 +76,7 @@ binary-indep: build install
# dh_installmanpages # dh_installmanpages
# dh_installinfo # dh_installinfo
# dh_undocumented # dh_undocumented
dh_installchangelogs CHANGES dh_installchangelogs NEWS
# dh_link # dh_link
dh_compress dh_compress
dh_fixperms dh_fixperms
@ -98,9 +104,9 @@ binary-arch: build install
dh_installman dh_installman
# dh_installinfo # dh_installinfo
# dh_undocumented # dh_undocumented
dh_installchangelogs CHANGES dh_installchangelogs NEWS
dh_strip dh_strip
dh_link usr/bin/scheme-elk usr/bin/elk dh_link usr/bin/elk usr/bin/scheme-elk
dh_compress dh_compress
dh_fixperms dh_fixperms
dh_installdeb dh_installdeb

4
lib/xaw/build
View File

@ -86,10 +86,10 @@ WIDGET_SET= xaw
../../scripts/makedl \$@ \$@ ../../scripts/makedl \$@ \$@
.d.c: .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: .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 \$(CC) \$(CFLAGS) -I\$(INC) -I../xlib $x11_incl -c \$*.c
../../scripts/makedl \$@ \$@ ../../scripts/makedl \$@ \$@

4
lib/xm/build
View File

@ -92,10 +92,10 @@ WIDGET_SET= xm
../../scripts/makedl \$@ \$@ ../../scripts/makedl \$@ \$@
.d.c: .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: .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 \$(CC) \$(CFLAGS) -I\$(INC) -I../xlib $sys_incl -c \$*.c
../../scripts/makedl \$@ \$@ ../../scripts/makedl \$@ \$@