Autofoo cleanups.

SVN revision: 31672

E-docs/Makefile.am

@@ -1,10 +1,5 @@
 edocdatadir = $(ENLIGHTENMENT_ROOT)/E-docs
 
 edocdata_DATA = @edocdata@
-edocdata_SCRIPTS = @edocexec@
 
 EXTRA_DIST = $(edocdata_DATA)
-EXTRA_SCRIPTS = 
-
-#install-data-local:
-#	$(mkinstalldirs) $(DESTDIR)$(edocdatadir)

Makefile.am

@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = foreign
+
 SUBDIRS = E-docs
 
 EXTRA_DIST = edox-data.spec

configure.in

@@ -1,11 +1,11 @@
-AC_INIT(edox-data.spec)
+AC_INIT(configure.in)
 
 AM_INIT_AUTOMAKE(e16-docs, 0.16.8-0.02)
 AM_MAINTAINER_MODE
 
 dnl reasonable guesses for where stuff is installed
 if test "x$prefix" = "xNONE"; then
-  prefix="/usr/local"
+  prefix=$ac_default_prefix
 fi
 if test "x$exec_prefix" = "xNONE"; then
   exec_prefix=$prefix
@@ -14,21 +14,13 @@ fi
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
-AC_ARG_ENABLE(fsstd,
-  [  --enable-fsstd          install files following FSSTD [default=yes]], ,enable_fsstd=yes)
-
-if test "x$enable_fsstd" != "xyes"; then
-  datadir=${prefix}
-fi
-ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
+DATADIR=`eval echo ${datadir}`
+ENLIGHTENMENT_ROOT=`eval echo ${DATADIR}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)
 
-edocdata=`ls -1 $srcdir/E-docs | egrep -v '(Makefile|CVS|^misc|\.sh$)'`
-edocexec=`ls -1 $srcdir/E-docs | egrep '\.sh$'`
-edocdata=`echo $edocdata`
-edocexec=`echo $edocexec`
+edocdata=`cd $srcdir/E-docs; ls -1 MAIN *.png *.ttf`
+edocdata=`eval echo $edocdata`
 AC_SUBST(edocdata)
-AC_SUBST(edocexec)
 
 AC_OUTPUT([
   Makefile