Installing binaries, good. Installing icons, still working on it. :)

SVN revision: 815

configure.in

@@ -157,7 +157,40 @@ if test "$IMLIB_CONFIG" = "no"; then
 
 fi
 
-AC_PREFIX(enlightenment)
+#
+# ok enlightenment d00ds want to ignore civilization and install
+# everything in one place. The rest of use prefer sanity.
+#
+AC_ARG_ENABLE(fsstd, [  --enable-fsstd    install files following FSSTD [default=no]], ,enable_fsstd=no)
+
+if test "x$enable_fsstd" = "xyes"; then
+  ENLIGHTENMENT_ROOT=${datadir}/enlightenment
+  ENLIGHTENMENT_BIN=${bindir}
+  USE_FSSTD=yes
+else
+  ENLIGHTENMENT_ROOT=${prefix}/enlightenment
+  ENLIGHTENMENT_BIN=${prefix}/enlightenment/bin
+  USE_FSSTD=no
+fi
+
+AC_MSG_CHECKING(for Enlightenment location)
+if test ! -z "$EROOT"; then
+  AC_SUBST(EROOT)
+  AC_MSG_RESULT($EROOT)
+else
+  EROOT=$ENLIGHTENMENT_ROOT
+  AC_MSG_RESULT(warning:  EROOT environment variable not detected.  Using $EROOT)
+  AC_SUBST(EROOT)
+fi
+AC_MSG_CHECKING(for Enlightenment binary location)
+if test ! -z "$EBIN"; then
+  AC_SUBST(EBIN)
+  AC_MSG_RESULT($EBIN)
+else
+  EBIN=$ENLIGHTENMENT_BIN
+  AC_MSG_RESULT(warning:  EBIN environment variable not detected.  Using $EBIN)
+  AC_SUBST(EBIN)
+fi
 
 CFLAGS=${CFLAGS--O}
 LDFLAGS=${LDFLAGS--O}

epplets/Makefile.am

@@ -1,5 +1,7 @@
 # $Id$
 
+bindir = $(EBIN)
+
 bin_PROGRAMS = E-Load.epplet E-Clock.epplet E-Net.epplet E-Cpu.epplet EppletTest.epplet
 
 E_Load_epplet_SOURCES = E-Load.c
@@ -26,3 +28,9 @@ INCLUDES = -I. -I$(top_srcdir)/api -I$(top_srcdir) -I.. -I$(includedir) -I$(pref
 LDADD = $(top_builddir)/api/libepplet.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(X_LIBS)
 
 EXTRA_DIST = E-Load.icon E-Clock.icon E-Net.icon E-Cpu.icon EppletTest.icon
+
+install-data-hook:
+	$(mkinstalldirs) $(EROOT)/epplet_icons
+	@for i in $(srcdir)/*.icon ; do \
+	  $(INSTALL_DATA) $$i $(EROOT)/epplet_icons/ \
+	done