Fix build-system: install data files (keys, apps, menu ...)

* Correctly build data files when operate outside of the $(srcdir)
* Actually install data files
* Use pkg-config to detect X11, works better on MacOSX. We used pkg-config
  already anyway, double checking for X11 does not yield better results.
* Replace EXEEXT in some files while before installing them

1 files changed, 3 insertions, 7 deletions

diff --git a/src/Makemodule.am b/src/Makemodule.am
index 2fd5891..3f1fa06 100644
--- a/src/Makemodule.am
+++ b/src/Makemodule.am
@@ -65,9 +65,9 @@ src/defaults.cc: force
                 echo ''; \
                 echo 'const char* gitrevision() {'; \
                 if test -r $$GITDIR/HEAD; then \
-                        echo '  return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";'; \
+                        echo '  return "'`cd $$GITDIR && git rev-parse HEAD`'";'; \
                 else \
-                        echo '  return "this_is_tar_ball_build";'; \
+                        echo '  return "unknown";'; \
                 fi; \
                 echo '}' ) > $(top_builddir)/src/defaults_tmp.cc
         @if ! cmp $(top_builddir)/src/defaults_tmp.cc $(top_builddir)/src/defaults.cc ; then cp $(top_builddir)/src/defaults_tmp.cc $(top_builddir)/src/defaults.cc; fi
@@ -151,11 +151,7 @@ fluxbox_LDADD = \
         $(XFT_LIBS) \
         $(XINERAMA_LIBS) \
         $(XPM_LIBS) \
-        $(XRENDER_LIBS) \
-        $(X_EXTRA_LIBS) \
-        $(X_LIBS) \
-        $(X_PRE_LIBS) \
-        $(X11_LIBS)
+        $(XRENDER_LIBS)
 
 fluxbox_SOURCES = \
         src/AlphaMenu.cc \