Add missing uninstall-local targets and fix configuration intall target

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1866 fd59a12c-fef9-0310-b244-a6a79926bd2f

Makefile.am

@@ -39,8 +39,10 @@ MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure depcomp \
 dist_doc_DATA		= LICENSE QUICKSTART README.devmap \
 			  README.recovery SECURITY TODO
 
+sysconf_DATA		= conf/corosync.conf
+
 SUBDIRS	= include lcr lib exec services tools test pkgconfig man
-# init conf
+# init
 
 lint:
 	for dir in lcr lib exec services tools test; do make -C $$dir lint; done
@@ -48,12 +50,6 @@ lint:
 doxygen:
 	mkdir -p doc/api && doxygen
 
-install-data-local:
-	$(INSTALL) -d $(DESTDIR)${sysconfdir}
-	if [ ! -f $(DESTDIR)${sysconfdir}/corosync.conf ] ; then 	   \
-		$(INSTALL) -m 644 $(srcdir)/conf/corosync.conf $(DESTDIR)${sysconfdir} ; \
-	fi
-
 dist-clean-local:
 	rm -f autoconf automake autoheader $(TARFILE)
 

exec/Makefile.am

@@ -117,5 +117,11 @@ install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
 	$(INSTALL) -m 755 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
 
+uninstall-local:
+	cd $(DESTDIR)/$(libdir) && \
+		rm -f $(SHARED_LIBS) $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO)
+	cd $(DESTDIR)/$(LCRSODIR) && \
+		rm -f $(LCRSO)
+
 clean-local:
 	rm -f corosync *.o *.lcrso gmon.out *.da *.bb *.bbg *.so*

lib/Makefile.am

@@ -106,6 +106,10 @@ install-exec-local:
 	$(INSTALL) -m 755 $(SHARED_LIBS) $(DESTDIR)/$(libdir)
 	cp -a $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO) $(DESTDIR)/$(libdir)
 
+uninstall-local:
+	cd $(DESTDIR)/$(libdir)/ && \
+		rm -f $(SHARED_LIBS) $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO)
+
 clean-local:
 	rm -f *.o *.a *.so* *.da *.bb *.bbg
 

man/Makefile.am

@@ -34,6 +34,10 @@
 
 MAINTAINERCLEANFILES	= Makefile.in
 
+EXTRA_DIST		= index.html
+
+index_html		= ${srcdir}/index.html
+
 dist_man_MANS = \
 	corosync.conf.5 \
 	confdb_overview.8 \
@@ -98,7 +102,11 @@ HTML_DOCS = $(dist_man_MANS:%=%.html)
 
 install-data-local:
 	install -d $(DESTDIR)/${docdir}/html
-	install -m644 *.html $(DESTDIR)/${docdir}/html/
+	install -m644 $(index_html) $(HTML_DOCS) $(DESTDIR)/${docdir}/html/
+
+uninstall-local:
+	cd $(DESTDIR)/${docdir}/html && rm -f $(EXTRA_DIST) $(HTML_DOCS)
+	rmdir $(DESTDIR)/${docdir}/html 2> /dev/null || :
 
 all-local: $(HTML_DOCS)
 

pkgconfig/Makefile.am

@@ -60,5 +60,9 @@ install-exec-local:
 	install -d $(DESTDIR)/$(libdir)/pkgconfig
 	install -m 644 $(target_LIBS) $(DESTDIR)/$(libdir)/pkgconfig
 
+uninstall-local:
+	cd $(DESTDIR)/$(libdir)/pkgconfig && rm -f $(target_LIBS)
+	rmdir $(DESTDIR)/$(libdir)/pkgconfig 2> /dev/null || :
+
 clean-local:
 	rm -f *.pc $(pkgconf_LIBS)

services/Makefile.am

@@ -71,6 +71,10 @@ install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
 	$(INSTALL) -m 755 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
 
+uninstall-local:
+	cd $(DESTDIR)/$(LCRSODIR) && \
+		rm -f $(LCRSO)
+
 clean-local:
 	rm -f *.o *.a *.so* *.da *.bb *.bbg *.lcrso