From f8ec75620d5e7c2d139cc523729a1223875f1fa0 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 2 Aug 2010 23:28:50 +0200 Subject: [PATCH] Don't add (extra) DESTDIR to tapsetdir for tapset_DATA. https://bugzilla.gnome.org/show_bug.cgi?id=625876 --- glib/Makefile.am | 2 +- gobject/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glib/Makefile.am b/glib/Makefile.am index 5d114a9..ebe41c9 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -353,7 +353,7 @@ endif 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 diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 44c886b..872991d 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -153,7 +153,7 @@ endif 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 -- 2.7.4