diff --git a/wmbiff/Makefile.am b/wmbiff/Makefile.am index c971f1c..169f91d 100644 --- a/wmbiff/Makefile.am +++ b/wmbiff/Makefile.am @@ -1,12 +1,6 @@ -SUBDIRS = wmgeneral wmbiff autoconf scripts +SUBDIRS = wmgeneral wmbiff scripts EXTRA_DIST = ChangeLog FAQ TODO -ACLOCAL_FLAGS = -I autoconf -## dummies. -ACLOCAL = @ACLOCAL@ $(ACLOCAL_FLAGS) - -## no longer needed AUTOHEADER = @AUTOHEADER@ -l autoconf - # make maintainer-clean is all about returning to CVS. # aclocal.m4 is generated by aclocal # config.h.in is generated by autoheader diff --git a/wmbiff/autoconf/Makefile.am b/wmbiff/autoconf/Makefile.am deleted file mode 100644 index 4c8ef12..0000000 --- a/wmbiff/autoconf/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -EXTRA_DIST = diff --git a/wmbiff/configure.ac b/wmbiff/configure.ac index 6280da7..1e507a7 100644 --- a/wmbiff/configure.ac +++ b/wmbiff/configure.ac @@ -7,7 +7,6 @@ dnl installation prefix dnl version AC_INIT(WMBiff, 0.4.33, wmaker-dev@googlegroups.com, wmbiff) -AC_CONFIG_AUX_DIR(autoconf) AM_INIT_AUTOMAKE AC_CONFIG_HEADER([config.h]) dnl make sure autoheader finds version, implicitly defined above. @@ -180,7 +179,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_SKIN_PATH, "$SKINDIR:/usr/share/wmbiff/skins:/usr/local/share/wmbiff/skins:.", [Path to use when finding skins (modified pixmaps)] ) dnl We're done. -AC_CONFIG_FILES(Makefile wmbiff/Makefile wmgeneral/Makefile wmbiff/wmbiffrc.5 autoconf/Makefile scripts/Makefile) +AC_CONFIG_FILES(Makefile wmbiff/Makefile wmgeneral/Makefile wmbiff/wmbiffrc.5 scripts/Makefile) AC_OUTPUT dnl remind not to write the file. chmod 0444 wmbiff/wmbiffrc.5