aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--data/Makefile.am6
-rw-r--r--src/Makefile.am3
-rw-r--r--src/tests/Makefile.am2
-rw-r--r--util/fluxbox-update_configs.cc2
5 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 8411e57..b0c5dfb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@
6SUBDIRS = doc nls src util data 6SUBDIRS = doc nls src util data
7MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in 7MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
8ACLOCAL_AMFLAGS = -I . 8ACLOCAL_AMFLAGS = -I .
9EXTRA_DIST = acinclude.m4 3rd/vim/* 3rd/vim/syntax/* 9EXTRA_DIST = acinclude.m4 $(top_srcdir)/3rd/vim/* $(top_srcdir)/3rd/vim/syntax/*
10 10
11uninstall-local: 11uninstall-local:
12 rmdir $(pkgdatadir) 12 rmdir $(pkgdatadir)
diff --git a/data/Makefile.am b/data/Makefile.am
index 856677d..ea462f1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -20,19 +20,19 @@ all-local: menu init apps
20install-pkgdataDATA: 20install-pkgdataDATA:
21 @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)" 21 @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
22 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU)) 22 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
23 $(INSTALL_DATA) $(srcdir)/menu $(DESTDIR)$(DEFAULT_MENU) 23 $(INSTALL_DATA) $(builddir)/menu $(DESTDIR)$(DEFAULT_MENU)
24 @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)" 24 @echo "Installing keys file in $(DESTDIR)$(DEFAULT_KEYS)"
25 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS)) 25 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_KEYS))
26 $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS) 26 $(INSTALL_DATA) $(srcdir)/keys $(DESTDIR)$(DEFAULT_KEYS)
27 @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)" 27 @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)"
28 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS)) 28 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS))
29 $(INSTALL_DATA) $(srcdir)/apps $(DESTDIR)$(DEFAULT_APPS) 29 $(INSTALL_DATA) $(builddir)/apps $(DESTDIR)$(DEFAULT_APPS)
30 @echo "Installing overlay file in $(DESTDIR)$(DEFAULT_OVERLAY)" 30 @echo "Installing overlay file in $(DESTDIR)$(DEFAULT_OVERLAY)"
31 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_OVERLAY)) 31 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_OVERLAY))
32 $(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY) 32 $(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY)
33 @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)" 33 @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
34 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT)) 34 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
35 $(INSTALL_DATA) $(srcdir)/init $(DESTDIR)$(DEFAULT_INIT) 35 $(INSTALL_DATA) $(builddir)/init $(DESTDIR)$(DEFAULT_INIT)
36 @echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)" 36 @echo "Installing windowmenu file in $(DESTDIR)$(DEFAULT_WINDOWMENU)"
37 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU)) 37 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
38 $(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU) 38 $(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)
diff --git a/src/Makefile.am b/src/Makefile.am
index 38182c5..e60f9b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,6 +58,7 @@ defaults.hh: Makefile
58 58
59defaults.cc: force 59defaults.cc: force
60 @( \ 60 @( \
61 GITDIR=$(top_srcdir)/.git; \
61 echo '#include "defaults.hh"'; \ 62 echo '#include "defaults.hh"'; \
62 echo ''; \ 63 echo ''; \
63 echo 'std::string realProgramName(const std::string& name) {'; \ 64 echo 'std::string realProgramName(const std::string& name) {'; \
@@ -65,7 +66,7 @@ defaults.cc: force
65 echo '}'; \ 66 echo '}'; \
66 echo ''; \ 67 echo ''; \
67 echo 'const char* gitrevision() {'; \ 68 echo 'const char* gitrevision() {'; \
68 echo ' return "'`cat ../.git/$$(cat ../.git/HEAD | cut -f 2 -d ' ')`'";';\ 69 echo ' return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";';\
69 echo '}' ) > defaults_tmp.cc 70 echo '}' ) > defaults_tmp.cc
70 @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi 71 @if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
71 @rm defaults_tmp.cc 72 @rm defaults_tmp.cc
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 1b82135..53e1ddc 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,4 +1,4 @@
1INCLUDES= -I.. 1INCLUDES= -I$(top_srcdir)/src
2 2
3noinst_PROGRAMS= \ 3noinst_PROGRAMS= \
4 testTexture \ 4 testTexture \
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 39539f8..37248ce 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -24,7 +24,7 @@
24#include "../src/FbTk/StringUtil.hh" 24#include "../src/FbTk/StringUtil.hh"
25#include "../src/FbTk/FileUtil.hh" 25#include "../src/FbTk/FileUtil.hh"
26 26
27#include "defaults.hh" 27#include "../src/defaults.hh"
28 28
29#ifdef HAVE_CONFIG_H 29#ifdef HAVE_CONFIG_H
30#include "config.h" 30#include "config.h"