diff options
author | Mathias Gumz <akira@fluxbox.org> | 2015-01-05 14:08:32 (GMT) |
---|---|---|
committer | Mathias Gumz <mathias.gumz@gmail.com> | 2015-01-05 14:08:32 (GMT) |
commit | f8d0bd4cb303caad68c121a77974a3a0daa0c40e (patch) | |
tree | 94f2e1482a054e2316d8e3b8a066dcb6bdfc1f29 /util | |
parent | 0820bcb640e9030a99a4c47119df6b9305e632da (diff) | |
download | fluxbox-f8d0bd4cb303caad68c121a77974a3a0daa0c40e.zip fluxbox-f8d0bd4cb303caad68c121a77974a3a0daa0c40e.tar.bz2 |
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
Diffstat (limited to 'util')
-rw-r--r-- | util/Makemodule.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/util/Makemodule.am b/util/Makemodule.am index b022f10..c985d0d 100644 --- a/util/Makemodule.am +++ b/util/Makemodule.am | |||
@@ -24,7 +24,6 @@ fbsetroot_LDADD = \ | |||
24 | libFbTk.a \ | 24 | libFbTk.a \ |
25 | $(FONTCONFIG_LIBS) \ | 25 | $(FONTCONFIG_LIBS) \ |
26 | $(FRIBIDI_LIBS) \ | 26 | $(FRIBIDI_LIBS) \ |
27 | $(X11_LIBS) \ | ||
28 | $(XFT_LIBS) \ | 27 | $(XFT_LIBS) \ |
29 | $(XRENDER_LIBS) | 28 | $(XRENDER_LIBS) |
30 | 29 | ||
@@ -45,13 +44,11 @@ fluxbox_update_configs_CPPFLAGS = \ | |||
45 | -I$(nls_incdir) | 44 | -I$(nls_incdir) |
46 | fluxbox_update_configs_LDADD = \ | 45 | fluxbox_update_configs_LDADD = \ |
47 | libFbTk.a \ | 46 | libFbTk.a \ |
48 | $(FRIBIDI_LIBS) \ | 47 | $(FRIBIDI_LIBS) |
49 | $(X11_LIBS) | ||
50 | 48 | ||
51 | fluxbox_remote_SOURCES = \ | 49 | fluxbox_remote_SOURCES = \ |
52 | util/fluxbox-remote.cc | 50 | util/fluxbox-remote.cc |
53 | fluxbox_remote_CPPFLAGS = \ | 51 | fluxbox_remote_CPPFLAGS = \ |
54 | $(AM_CPPFLAGS) \ | 52 | $(AM_CPPFLAGS) \ |
55 | -I$(fbtk_incdir) | 53 | -I$(fbtk_incdir) |
56 | fluxbox_remote_LDADD = \ | 54 | |
57 | $(X11_LIBS) | ||