diff --git a/MANIFEST b/MANIFEST index d8c1576..cfe5394 100644 --- a/MANIFEST +++ b/MANIFEST @@ -60,16 +60,3 @@ doc/INSTALLING doc/TODO doc/CARDS.doc doc/ROMDump.doc -rpm/x48.spec.in -rpm/x48.spec -debian/README.Debian -debian/changelog -debian/compat -debian/control -debian/copyright -debian/dirs -debian/docs -debian/menu -debian/quit -debian/rules -debian/watch diff --git a/Makefile.am b/Makefile.am index 70335a4..fb4e3f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,8 @@ - - AUTOMAKE_OPTIONS = dejagnu SUBDIRS = src romdump -EXTRA_DIST=rpm/x48.spec \ - debian/changelog debian/compat debian/control debian/copyright \ - debian/dirs debian/docs debian/menu debian/README.Debian debian/rules +EXTRA_DIST= X48 : src/X48.ad cp $< $@ @@ -14,4 +10,3 @@ X48 : src/X48.ad appdefault_DATA = X48 DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir='$${datadir}/X11/app-defaults' - diff --git a/configure.ac b/configure.ac index 235a76d..7b2689d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,3 @@ - m4_include([version.m4]) AC_INIT([x48],[VERSION_NUMBER],[x48-bugs@gam3.net]) @@ -19,7 +18,7 @@ AC_PROG_CPP AC_PATH_XTRA if test x"$no_x" = xyes ; then AC_MSG_ERROR([X development libraries not found]) -fi +fi X_LIBS="$X_LIBS -lX11" AC_SUBST(X_LIBS) @@ -41,8 +40,8 @@ AH_TEMPLATE([HAVE_READLINE],[Define if Readline is used.]) if test x"$with_readline" != xno; then AC_CHECK_LIB(readline, readline, with_readline=yes; - LIBS="$LIBS -lreadline"; - AC_DEFINE(HAVE_READLINE), + LIBS="$LIBS -lreadline"; + AC_DEFINE(HAVE_READLINE), with_readline=no; problem_readline=": Can't detect readline library.", []) @@ -119,7 +118,6 @@ AM_INIT_AUTOMAKE AC_CONFIG_FILES([Makefile romdump/Makefile src/x48.man - rpm/x48.spec src/Makefile]) AC_OUTPUT @@ -135,4 +133,3 @@ X48 Configuration: With Shared memory for XImage? $with_shm$problem_shm # See INSTALL for the description of what this may mean." -