From ecf024d66edf10ea6098de1129af08b25e527bb5 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 20 Aug 2004 10:55:54 +0000
Subject: build fixes

git-svn-id: file:///home/lennart/svn/public/paman/trunk@19 cdefa82f-4ce1-0310-97f5-ab6066f37c3c
---
 src/Makefile.am | 4 +++-
 src/paman.hh    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index d374193..51137a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
 
 bin_PROGRAMS=paman
 
+dist_pkgdata_DATA=paman.glade
+
 paman_SOURCES=MainWindow.cc MainWindow.hh \
 	SinkWindow.cc SinkWindow.hh \
 	SourceWindow.cc SourceWindow.hh \
@@ -14,4 +16,4 @@ paman_SOURCES=MainWindow.cc MainWindow.hh \
 	SampleWindow.cc SampleWindow.hh
 
 paman_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(POLYP_LIBS)
-paman_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(POLYP_CFLAGS) 
+paman_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(POLYP_CFLAGS) -DGLADE_FILE=\"$(pkgdatadir)/paman.glade\"
diff --git a/src/paman.hh b/src/paman.hh
index 05e1815..c80cc42 100644
--- a/src/paman.hh
+++ b/src/paman.hh
@@ -3,7 +3,9 @@
 
 #include "ServerInfoManager.hh"
 
+#ifndef GLADE_FILE
 #define GLADE_FILE "paman.glade"
+#endif
 
 extern ServerInfoManager *serverInfoManager;
 extern MainWindow *mainWindow;
-- 
cgit