Greetings;
Occasionally I want to configure and build blackbox in a directory
which is not the source directory. The Makefiles in the data/,
doc/, and nls/ directories assume we are configuring and building
in the source directory, though.
The following patch fixes this by sprinkling "@srcdir@"s where
necessary. If you apply the patch, you will need to rerun automake
in the top level source directory.
Cheers,
Craig
P.S. I am very happy to see blackbox development picking up again.
Keep up the great work!
diff -ur blackbox-0.62.0pre4-orig/data/Makefile.am blackbox-0.62.0pre4/data/Makefile.am
--- blackbox-0.62.0pre4-orig/data/Makefile.am Fri Jan 4 19:01:00 2002
+++ blackbox-0.62.0pre4/data/Makefile.am Sat Jan 12 23:29:13 2002
@@ -10,4 +10,4 @@
rm -f *\~
menu: menu.in
- @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," menu.in > menu
+ @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," @srcdir@/menu.in > menu
diff -ur blackbox-0.62.0pre4-orig/doc/Makefile.am blackbox-0.62.0pre4/doc/Makefile.am
--- blackbox-0.62.0pre4-orig/doc/Makefile.am Fri Jan 4 19:01:41 2002
+++ blackbox-0.62.0pre4/doc/Makefile.am Sat Jan 12 23:33:51 2002
@@ -10,4 +10,4 @@
rm -f *\~
blackbox.1: blackbox.1.in
- @regex_cmd@ -e "s,@defaultmenu@,$(DEFAULT_MENU)," blackbox.1.in > blackbox.1
+ @regex_cmd@ -e "s,@defaultmenu@,$(DEFAULT_MENU)," @srcdir@/blackbox.1.in >
+blackbox.1
diff -ur blackbox-0.62.0pre4-orig/nls/C/Makefile.am
blackbox-0.62.0pre4/nls/C/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/C/Makefile.am Sat Jan 12 03:16:26 2002
+++ blackbox-0.62.0pre4/nls/C/Makefile.am Sat Jan 12 23:42:39 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: Translation.m blackbox.cat
install-data-local: blackbox.cat
@@ -36,7 +36,7 @@
# only need to generate it once.
Translation.m: $(MFILES)
- awk -f ../convert.awk header=../blackbox-nls.hh \
+ awk -f @srcdir@/../convert.awk header=../blackbox-nls.hh \
output=Translation.m $(MFILES)
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/da_DK/Makefile.am
blackbox-0.62.0pre4/nls/da_DK/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/da_DK/Makefile.am Fri Jan 4 19:02:33 2002
+++ blackbox-0.62.0pre4/nls/da_DK/Makefile.am Sat Jan 12 23:45:29 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -21,7 +21,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/es_ES/Makefile.am
blackbox-0.62.0pre4/nls/es_ES/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/es_ES/Makefile.am Fri Jan 4 19:02:45 2002
+++ blackbox-0.62.0pre4/nls/es_ES/Makefile.am Sat Jan 12 23:46:26 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -24,7 +24,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/et_EE/Makefile.am
blackbox-0.62.0pre4/nls/et_EE/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/et_EE/Makefile.am Fri Jan 4 19:03:00 2002
+++ blackbox-0.62.0pre4/nls/et_EE/Makefile.am Sat Jan 12 23:47:08 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -21,7 +21,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/fr_FR/Makefile.am
blackbox-0.62.0pre4/nls/fr_FR/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/fr_FR/Makefile.am Fri Jan 4 19:03:09 2002
+++ blackbox-0.62.0pre4/nls/fr_FR/Makefile.am Sat Jan 12 23:47:49 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -24,7 +24,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/it_IT/Makefile.am
blackbox-0.62.0pre4/nls/it_IT/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/it_IT/Makefile.am Mon Jan 7 14:05:54 2002
+++ blackbox-0.62.0pre4/nls/it_IT/Makefile.am Sat Jan 12 23:48:42 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -24,7 +24,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/ja_JP/Makefile.am
blackbox-0.62.0pre4/nls/ja_JP/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/ja_JP/Makefile.am Fri Jan 4 19:03:20 2002
+++ blackbox-0.62.0pre4/nls/ja_JP/Makefile.am Sat Jan 12 23:49:28 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -21,7 +21,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/nl_NL/Makefile.am
blackbox-0.62.0pre4/nls/nl_NL/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/nl_NL/Makefile.am Sat Jan 5 10:50:57 2002
+++ blackbox-0.62.0pre4/nls/nl_NL/Makefile.am Sat Jan 12 23:50:06 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -24,7 +24,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/pt_BR/Makefile.am
blackbox-0.62.0pre4/nls/pt_BR/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/pt_BR/Makefile.am Fri Jan 4 19:03:33 2002
+++ blackbox-0.62.0pre4/nls/pt_BR/Makefile.am Sat Jan 12 23:50:43 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -21,7 +21,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/ru_RU/Makefile.am
blackbox-0.62.0pre4/nls/ru_RU/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/ru_RU/Makefile.am Fri Jan 4 19:03:43 2002
+++ blackbox-0.62.0pre4/nls/ru_RU/Makefile.am Sat Jan 12 23:51:22 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -21,7 +21,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/sv_SE/Makefile.am
blackbox-0.62.0pre4/nls/sv_SE/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/sv_SE/Makefile.am Fri Jan 4 19:03:57 2002
+++ blackbox-0.62.0pre4/nls/sv_SE/Makefile.am Sat Jan 12 23:52:03 2002
@@ -4,7 +4,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -21,7 +21,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
diff -ur blackbox-0.62.0pre4-orig/nls/tr_TR/Makefile.am
blackbox-0.62.0pre4/nls/tr_TR/Makefile.am
--- blackbox-0.62.0pre4-orig/nls/tr_TR/Makefile.am Fri Jan 4 19:04:08 2002
+++ blackbox-0.62.0pre4/nls/tr_TR/Makefile.am Sat Jan 12 23:52:45 2002
@@ -8,7 +8,7 @@
CLEANFILES = blackbox.cat
MAINTAINERCLEANFILES = Makefile.in Translation.m
DISTCLEANFILES = Translation.m
-MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m
Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m
bsetroot.m
+MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m
+@srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m
+@srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m
+@srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m
all-local: blackbox.cat
install-data-local: blackbox.cat
@@ -25,7 +25,7 @@
Translation.m: $(MFILES)
@if test x$(NLSTEST) = "x-DNLS"; then \
- awk -f ../convert.awk output=Translation.m $(MFILES); \
+ awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
fi
blackbox.cat: Translation.m
