[PATCH] nm-applet: build fix for srcdir != builddir



Hi,

nm-applet currently fails "make distcheck".

Reason is, that nm-marshal.h is generated in builddir, not srcdir.

I fixed the Makefile.amS accordingly.

Another problem is, that po/POTFILES.in is not up-to-date.

Patch is attached.

Cheers,
Michael

--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Index: src/gconf-helpers/Makefile.am
===================================================================
--- src/gconf-helpers/Makefile.am	(Revision 713)
+++ src/gconf-helpers/Makefile.am	(Arbeitskopie)
@@ -13,7 +13,7 @@
 libgconf_helpers_la_CPPFLAGS = \
 	$(NMA_CFLAGS) \
 	-I${top_srcdir}/src \
-	-I${top_srcdir}/src/marshallers \
+	-I${top_builddir}/src/marshallers \
 	-I${top_srcdir}/src/utils
 
 libgconf_helpers_la_LIBADD = \
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(Revision 713)
+++ src/Makefile.am	(Arbeitskopie)
@@ -17,7 +17,7 @@
 	-DNMALOCALEDIR=\"$(datadir)/locale\"					\
 	$(DBUS_CFLAGS)										\
 	$(DISABLE_DEPRECATED)	\
-	-I${top_srcdir}/src/marshallers \
+	-I${top_builddir}/src/marshallers \
 	-I${top_srcdir}/src/utils \
 	-I${top_srcdir}/src/gconf-helpers  \
 	-I${top_srcdir}/src/wireless-security  \
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in	(Revision 713)
+++ po/POTFILES.in	(Arbeitskopie)
@@ -2,7 +2,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 src/applet-dbus-manager.c
-src/applet-dbus-settings.c
 src/applet-device-cdma.c
 src/applet-device-gsm.c
 src/applet-device-wired.c

Attachment: signature.asc
Description: OpenPGP digital signature



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]