* Put in special test for "=inst" such that an exception is made

in setting EROOT and EBIN so make distcheck
* Added support for makefile in debian direcotry such that debian files
  will be included in a make dist and friends
* Fixed bug in configure.in where -z flag was used without the arguments
  being in dobule quotes when checking for $GNOME_FRIENDLY.
* Removed creation of symlinks of aircut3.ttf and bg.png from
  epplets.spec(.in) as this is now handled in the epplets Makefile(.am)


SVN revision: 4181

Makefile.am

@@ -2,6 +2,6 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = api epplets
+SUBDIRS = api epplets debian
 
 EXTRA_DIST = autogen.sh epplets.spec epplets.spec.in

api/Makefile.am

@@ -7,10 +7,13 @@ libepplet_la_SOURCES = epplet.c snprintf.c
 libepplet_la_DEPENDENCIES = $(top_builddir)/config.h epplet.h
 libepplet_la_LDFLAGS = -version-info 1:0:1
 
-INCLUDES = -I. -I$(top_srcdir) -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
+INCLUDES = -I. -I$(top_srcdir) -I.. -I$(includedir) \
+-I$(prefix)/include $(X_CFLAGS)
+
 LDADD = -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
 
 EXTRA_DIST = epplet.h.in
 
 epplet.h: epplet.h.in
-	sed -e "s%@""EROOT@%@EROOT@%g" -e "s%@""EBIN@%@EBIN@%g" $(srcdir)/epplet.h.in > $(srcdir)/epplet.h
+	sed -e "s%@""EROOT@%@EROOT@%g" -e "s%@""EBIN@%@EBIN@%g" \
+		$(srcdir)/epplet.h.in > $(srcdir)/epplet.h

configure.in

@@ -266,8 +266,12 @@ AC_ARG_ENABLE(new-remember,
 )
 
 
+# If $EROOT is set use it, unless a make distcheck is being done
+# Makes the gratuitous assumption that "=inst" is neccessary and
+# sufficuent for a make distcheck
 AC_MSG_CHECKING(for Enlightenment location)
-if test ! -z "$EROOT"; then
+if test -n "$EROOT" -a `echo "$prefix" | sed -e 's:=inst::'` = "$prefix"
+then
   AC_SUBST(EROOT)
   AC_MSG_RESULT($EROOT)
 else
@@ -275,8 +279,12 @@ else
   AC_MSG_RESULT(warning:  EROOT environment variable not detected.  Using $EROOT)
   AC_SUBST(EROOT)
 fi
+# If $EBIN is set use it, unless a make distcheck is being done
+# Makes the gratuitous assumption that "=inst" is neccessary and
+# sufficuent for a make distcheck
 AC_MSG_CHECKING(for Enlightenment binary location)
-if test ! -z "$EBIN"; then
+if test -n "$EBIN" -a `echo "$prefix" | sed -e 's:=inst::'` = "$prefix"
+then
   AC_SUBST(EBIN)
   AC_MSG_RESULT($EBIN)
 else
@@ -353,7 +361,7 @@ basedir=.
 
 AM_CONFIG_HEADER(config.h)
 
-AC_OUTPUT(epplets.spec Makefile api/Makefile epplets/Makefile)
+AC_OUTPUT(epplets.spec Makefile api/Makefile epplets/Makefile debian/Makefile)
 
 echo "creating api/epplet.h"
 sed -e "s%@EROOT@%$EROOT%g" -e "s%@EBIN@%$EBIN%g" -e "s%\${exec_prefix}%${exec_prefix}%g" -e "s%\${prefix}%${prefix}%g" ${srcdir}/api/epplet.h.in > api/epplet.h.new

epplets.spec.in

@@ -29,7 +29,7 @@ slideshow, a URL grabber, a panel-like toolbar, and more.
 %setup -q
 
 %build
-if [ -z $GNOME_FRIENDLY ]; then
+if [ -z "$GNOME_FRIENDLY" ]; then
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --enable-fsstd
 else
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} \
@@ -41,16 +41,6 @@ make
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# Make all the aircut3.ttf and bg.png files symlinks to 1 of each.
-cd $RPM_BUILD_ROOT%{eroot}/epplet_data
-for i in aircut3.ttf bg.png ; do
-  install -m 644 $RPM_BUILD_DIR/%{name}-%{ver}/epplets/E-Cpu.ABOUT/$i .
-  for j in `find . -name $i -print` ; do
-    rm -f $j
-    ln -s ../../$i $j
-  done
-done
-
 %post
 /sbin/ldconfig