pass on and

diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index ea2cb3171e4ecb41412a197fcb12d2817c375dc1..6bb96fdea5a97ecb8316678b5bc462c799587487 100644 (file)
--- a/cmd/gvedit/Makefile.am
+++ b/cmd/gvedit/Makefile.am
@@ -9,7 +9,7 @@ qMakefile: gvedit.pro
        qmake-qt4 -o qMakefile gvedit.pro
 
 gvedit: main.cpp qMakefile
-       $(MAKE) -f qMakefile prefix=${prefix} libdir=${libdir}
+       $(MAKE) -f qMakefile prefix=${prefix} exec_prefix=${exec_prefix}
 
 EXTRA_DIST = csettings.cpp csettings.h document1.png document2.png \
        gvedit.pro gvedit.ncb gvedit.sln gvedit.vcproj gvedit.vcproj.RESEARCH.arif.user gvedit.vcproj.user \

diff --git a/cmd/gvedit/gvedit.pro.in b/cmd/gvedit/gvedit.pro.in
index 4ebdc8511f23286a934bac2aa39ee53448b2b0ae..64cbe0adc4e0f98c3986690e8fe4230acd6b6c68 100644 (file)
--- a/cmd/gvedit/gvedit.pro.in
+++ b/cmd/gvedit/gvedit.pro.in
@@ -1,5 +1,5 @@
 
-DEFINES += HAVE_CONFIG_H GVEDIT_DATADIR=@datadir@/graphviz/gvedit
+DEFINES += HAVE_CONFIG_H GVEDIT_DATADIR=@datarootdir@/graphviz/gvedit
 LIBS += -L@libdir@ -lgvc -lgraph -lcdt
 INCLUDEPATH += \
        /usr/include/Qt \