projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e1c4b1)
Don't add (extra) DESTDIR to tapsetdir for tapset_DATA.
authorMark Wielaard <mjw@redhat.com>
Mon, 2 Aug 2010 21:28:50 +0000 (23:28 +0200)
committerColin Walters <walters@verbum.org>
Tue, 3 Aug 2010 12:04:58 +0000 (08:04 -0400)
https://bugzilla.gnome.org/show_bug.cgi?id=625876

glib/Makefile.am patch | blob | history
gobject/Makefile.am patch | blob | history

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 5d114a9..ebe41c9 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -353,7 +353,7 @@ endif
 
 if ENABLE_SYSTEMTAP
 tapset_in_files = glib.stp.in
 
 if ENABLE_SYSTEMTAP
 tapset_in_files = glib.stp.in
-tapsetdir   = $(DESTDIR)@ABS_TAPSET_DIR@
+tapsetdir   = @ABS_TAPSET_DIR@
 tapset_DATA = $(tapset_in_files:.stp.in=.stp)
 EXTRA_DIST += $(tapset_in_files)
 endif
 tapset_DATA = $(tapset_in_files:.stp.in=.stp)
 EXTRA_DIST += $(tapset_in_files)
 endif
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 44c886b..872991d 100644 (file)
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -153,7 +153,7 @@ endif
 
 if ENABLE_SYSTEMTAP
 tapset_in_files = gobject.stp.in
 
 if ENABLE_SYSTEMTAP
 tapset_in_files = gobject.stp.in
-tapsetdir   = $(DESTDIR)@ABS_TAPSET_DIR@
+tapsetdir   = @ABS_TAPSET_DIR@
 tapset_DATA = $(tapset_in_files:.stp.in=.stp)
 EXTRA_DIST += $(tapset_in_files)
 endif
 tapset_DATA = $(tapset_in_files:.stp.in=.stp)
 EXTRA_DIST += $(tapset_in_files)
 endif
Domain: System / Base;