diff --git a/ChangeLog b/ChangeLog index 444301b..12e3fbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2356,3 +2356,8 @@ Fri Aug 27 19:39:26 PDT 1999 Michael Jennings Fix fix fix. ------------------------------------------------------------------------------- +Fri Sep 3 17:05:02 PDT 1999 Michael Jennings + + Eterm passes "make distcheck" now. Hurray. + +------------------------------------------------------------------------------- diff --git a/bg/Makefile.am b/bg/Makefile.am index 74822e1..c4acb8d 100644 --- a/bg/Makefile.am +++ b/bg/Makefile.am @@ -9,39 +9,38 @@ themedir = $(pkgdatadir)/themes all: Makefile @echo "*** Generating pixmap list files from images in tile/ and scale/..." - @true > pixmaps.list - @cd tile ; \ - true > tiled-pixmaps.list ; \ + @true > $(srcdir)/pixmaps.list + @true > $(srcdir)/tile/tiled-pixmaps.list + @true > $(srcdir)/scale/scaled-pixmaps.list + @cd $(srcdir)/tile ; \ for i in `ls -1 | grep -v CVS | grep -v \.cvsignore | grep -v pixmaps.list` ; do \ - echo $$i >> tiled-pixmaps.list ; \ - echo '"'$$i'@0x0+0+0:tile"' >> ../pixmaps.list ; \ + echo $$i >> $(srcdir)/tile/tiled-pixmaps.list ; \ + echo '"'$$i'@0x0+0+0:tile"' >> $(srcdir)/pixmaps.list ; \ done ; \ - cd .. ; \ - cd scale ; \ - true > scaled-pixmaps.list ; \ + cd $(srcdir)/scale ; \ for i in `ls -1 | grep -v CVS | grep -v \.cvsignore | grep -v pixmaps.list` ; do \ - echo $$i >> scaled-pixmaps.list ; \ - echo '"'$$i'@100x100"' >> ../pixmaps.list ; \ + echo $$i >> $(srcdir)/scale/scaled-pixmaps.list ; \ + echo '"'$$i'@100x100"' >> $(srcdir)/pixmaps.list ; \ done install-data-hook: - @if test ! -f pixmaps.list ; then $(MAKE) all ; fi + @if test ! -f $(srcdir)/pixmaps.list ; then $(MAKE) all ; fi $(mkinstalldirs) $(DESTDIR)$(pixmapdir) - @for j in $(DIRS) ; do echo "Installing pixmaps in $$j" ; cd $$j ; \ + @(for j in $(DIRS) ; do echo "Installing pixmaps in $$j" ; cd $(srcdir)/$$j ; \ for i in `ls -1 | grep -v CVS | grep -v \.cvsignore | grep -v pixmaps.list` ; do \ echo $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir} ; \ $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir} ; \ - done ; cd .. ; \ - done + done ; \ + done) @for i in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \ if test -f $(DESTDIR)${pixmapdir}/$$i ; then \ $(CP) -p $(DESTDIR)${pixmapdir}/$$i $(DESTDIR)${pixmapdir}/$$i.old ; \ echo "WARNING: Backup of existing $$i created." ; \ fi ; \ done - $(INSTALL_DATA) tile/tiled-pixmaps.list $(DESTDIR)${pixmapdir} - $(INSTALL_DATA) scale/scaled-pixmaps.list $(DESTDIR)${pixmapdir} - $(INSTALL_DATA) pixmaps.list $(DESTDIR)${pixmapdir} + $(INSTALL_DATA) $(srcdir)/tile/tiled-pixmaps.list $(DESTDIR)${pixmapdir} + $(INSTALL_DATA) $(srcdir)/scale/scaled-pixmaps.list $(DESTDIR)${pixmapdir} + $(INSTALL_DATA) $(srcdir)/pixmaps.list $(DESTDIR)${pixmapdir} @for i in `ls -1d $(DESTDIR)${themedir}/*` ; do \ for j in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \ if test $$i != "." -a $$i != ".." -a ! -f $$i/$$j ; then \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 3bdcfa8..45c4828 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,8 +4,8 @@ man_MANS = Eterm.1 all: Makefile Eterm.1.html -Eterm.1: Eterm.1.in - $(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $@.in > $@ +Eterm.1: $(top_srcdir)/doc/Eterm.1.in + $(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@ Eterm.1.html: Eterm.1 -nroff -man $< | man2html > $@ diff --git a/pix/Makefile.am b/pix/Makefile.am index fb0f226..b5d748e 100644 --- a/pix/Makefile.am +++ b/pix/Makefile.am @@ -9,6 +9,6 @@ pixmapdir = $(pkgdatadir)/pix install-data-hook: $(mkinstalldirs) $(DESTDIR)$(pixmapdir) @for i in $(EXTRA_DIST) ; do \ - echo $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir} ; \ - $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir} ; \ + echo $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)${pixmapdir} ; \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)${pixmapdir} ; \ done diff --git a/src/Makefile.am b/src/Makefile.am index 5a6aafd..0131196 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libEterm.la libEterm_la_SOURCES = actions.c command.c e.c events.c graphics.c grkelot.c menus.c misc.c netdisp.c \ options.c pixmap.c screen.c scrollbar.c system.c term.c threads.c timer.c utmp.c windows.c -libEterm_la_DEPENDENCIES = $(top_srcdir)/libmej/libmej.la feature.h +libEterm_la_DEPENDENCIES = $(top_builddir)/libmej/libmej.la feature.h libEterm_la_LDFLAGS = -version-info 9:0:9 bin_PROGRAMS = Eterm @@ -13,7 +13,7 @@ Eterm_DEPENDENCIES = libEterm.la Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir) INCLUDES = -I. -I$(top_srcdir)/libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) -LDADD = libEterm.la $(top_srcdir)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS) +LDADD = libEterm.la $(top_builddir)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS) EXTRA_DIST = actions.h command.h debug.h e.h eterm_utmp.h events.h feature.h graphics.h grkelot.h grx.h main.h menus.h misc.h \ options.h pixmap.h profile.h screen.h scrollbar.h system.h term.h threads.h timer.h windows.h graphics/Makefile.am \ diff --git a/themes/Makefile.am b/themes/Makefile.am index c66c35b..0d7b8a5 100644 --- a/themes/Makefile.am +++ b/themes/Makefile.am @@ -8,14 +8,15 @@ EXTRA_DIST = Eterm/theme.cfg.in irc/theme.cfg.in chooser/theme.cfg.in emacs/them install-data-hook: -@for i in $(THEMES) ; do \ - $(SED) -e 's%@''PREFIX''@%${prefix}%g' -e 's%@''PKGDATADIR''@%${DESTDIR}${pkgdatadir}%g' -e 's%@''THEME''@%'$$i'%g' $$i/theme.cfg.in > $$i/theme.cfg ; \ + $(SED) -e 's%@''PREFIX''@%${prefix}%g' -e 's%@''PKGDATADIR''@%${DESTDIR}${pkgdatadir}%g' -e 's%@''THEME''@%'$$i'%g' \ + $(srcdir)/$$i/theme.cfg.in > $(srcdir)/$$i/theme.cfg ; \ done $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes -@for i in $(THEMES) ; do \ if test ! -d $(DESTDIR)$(pkgdatadir)/themes/$$i ; then \ echo "Installing $$i theme in $(DESTDIR)$(pkgdatadir)/themes" ; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes/$$i ; \ - $(CP) $$i/???* $(DESTDIR)$(pkgdatadir)/themes/$$i ; \ + $(CP) $(srcdir)/$$i/???* $(DESTDIR)$(pkgdatadir)/themes/$$i ; \ $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/themes/$$i ; \ $(CHMOD) 644 $(DESTDIR)$(pkgdatadir)/themes/$$i/???* ; \ rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/theme.cfg.in ; \