summaryrefslogtreecommitdiff
blob: b451be8464b7a0e884fd455047df707d797d6c2c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
Description: Use a custom target, programfilesdir, to install to pkglibdir.
 Automake 1.11.2 changed behaviour here, breaking the build.
Author: Iain Lane <laney@debian.org>
Forwarded: no

Index: b/Makefile.am
===================================================================
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
 EXTRA_DIST =  expansions.m4
 SUBDIRS = Zeitgeist
-EXTRA_DIST = LICENSE MAINTAINERS NEWS
+EXTRA_DIST += LICENSE MAINTAINERS NEWS
Index: b/Zeitgeist/Makefile.am
===================================================================
--- a/Zeitgeist/Makefile.am
+++ b/Zeitgeist/Makefile.am
@@ -13,7 +13,8 @@
 ZS_GACUTIL_UNINSTALL = $(GACUTIL) -u $(ZS_ASSEMBLY_NAME) $(GACUTIL_FLAGS)
 
 # magic automake variables
-pkglib_DATA = \
+programfilesdir = $(pkglibdir)
+programfiles_DATA = \
 	$(ZS_ASSEMBLY_TARGET) $(ZS_ASSEMBLY_TARGET).mdb
 
 EXTRA_DIST = \