X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=3c75e1ec20fdf7dc02c9e7f0a9e01fe1e0c3b65a;hb=b200e9bab1ec8a398e07d4e3dc7698aa8b84bc6a;hp=f9e95a1734b65486f00f6245bc6a6e190cc56d6e;hpb=e5e7182ca1af1bbd98b428225646aa58f45a3d7b;p=catta

diff --git a/Makefile.am b/Makefile.am
index f9e95a1..3c75e1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,6 +88,7 @@ DX_INPUT = \
 	$(srcdir)/avahi-common/domain.h \
 	$(srcdir)/avahi-common/watch.h \
 	$(srcdir)/avahi-common/simple-watch.h \
+	$(srcdir)/avahi-common/thread-watch.h \
 	$(srcdir)/avahi-glib/glib-watch.h \
 	$(srcdir)/avahi-glib/glib-malloc.h \
 	$(srcdir)/avahi-common/timeval.h \
@@ -102,6 +103,7 @@ pkgconfig_DATA = avahi-core.pc
 
 avahi-core.pc: avahi-core.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES = avahi-core.pc
@@ -112,6 +114,7 @@ pkgconfig_DATA += avahi-client.pc
 
 avahi-client.pc: avahi-client.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-client.pc
@@ -122,6 +125,7 @@ pkgconfig_DATA += avahi-compat-howl.pc
 
 avahi-compat-howl.pc: avahi-compat-howl.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' $< > $@
 
 CLEANFILES += avahi-compat-howl.pc
@@ -134,6 +138,7 @@ pkgconfig_DATA += avahi-compat-libdns_sd.pc
 
 avahi-compat-libdns_sd.pc: avahi-compat-libdns_sd.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-compat-libdns_sd.pc
@@ -161,6 +166,7 @@ pkgconfig_DATA += avahi-glib.pc
 
 avahi-glib.pc: avahi-glib.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-glib.pc
@@ -173,6 +179,7 @@ pkgconfig_DATA += avahi-qt3.pc
 
 avahi-qt3.pc: avahi-qt3.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-qt3.pc
@@ -185,6 +192,7 @@ pkgconfig_DATA += avahi-qt4.pc
 
 avahi-qt4.pc: avahi-qt4.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
+	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
 CLEANFILES += avahi-qt4.pc
@@ -200,8 +208,8 @@ homepage:
 	$(MAKE) -C man
 	scp avahi-daemon/*.introspect avahi-daemon/introspect.dtd avahi-daemon/introspect.xsl\
 	    man/*.xml man/xmltoman.dtd man/xmltoman.xsl \
-	    fdo:public_html/
+	    tango:www/avahi.org/tree/download/
 	rm -rf doxygen
 	$(MAKE) doxygen-run
-	ssh fdo rm -rf public_html/doxygen
-	scp -r doxygen/html fdo:public_html/doxygen
+	ssh tango rm -rf www/avahi.org/tree/download/doxygen
+	scp -r doxygen/html tango:www/avahi.org/tree/download/doxygen