End of the libcucul merge: add symbolic links where appropriate.

caca/Makefile.am

@@ -56,13 +56,21 @@ libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -D__LIBCACA__
 libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
 libcaca_la_LIBADD = @CACA_LIBS@ $(ZLIB_LIBS)
 
-install-exec-hook:
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	ln -sf libcaca.so $(DESTDIR)$(libdir)/libcucul.so
 	ln -sf libcaca.so.0 $(DESTDIR)$(libdir)/libcucul.so.0
 
-uninstall-hook:
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
+	ln -sf caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
+
+uninstall-local:
 	rm -f $(DESTDIR)$(libdir)/libcucul.so
 	rm -f $(DESTDIR)$(libdir)/libcucul.so.0
+	rmdir $(DESTDIR)$(libdir) 2>/dev/null || true
+	rm -f $(DESTDIR)$(pkgconfigdir)/cucul.pc
+	rmdir $(DESTDIR)$(pkgconfigdir) 2>/dev/null || true
 
 if USE_PLUGINS
 plugin_LTLIBRARIES = libx11_plugin.la libgl_plugin.la

cxx/Makefile.am

@@ -21,11 +21,19 @@ endif
 cxxtest_SOURCES = cxxtest.cpp
 cxxtest_LDADD = libcaca++.la ../caca/libcaca.la
 
-install-exec-hook:
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	ln -sf libcaca++.so $(DESTDIR)$(libdir)/libcucul++.so
 	ln -sf libcaca++.so.0 $(DESTDIR)$(libdir)/libcucul++.so.0
 
-uninstall-hook:
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
+	ln -sf caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
+
+uninstall-local:
 	rm -f $(DESTDIR)$(libdir)/libcucul++.so
 	rm -f $(DESTDIR)$(libdir)/libcucul++.so.0
+	rmdir $(DESTDIR)$(libdir) 2>/dev/null || true
+	rm -f $(DESTDIR)$(pkgconfigdir)/cucul++.pc
+	rmdir $(DESTDIR)$(pkgconfigdir) 2>/dev/null || true
 

doc/Makefile.am

@@ -43,6 +43,7 @@ clean-local:
 
 install-data-local:
 if BUILD_DOCUMENTATION
+	ln -s libcaca-dev $(DESTDIR)$(datadir)/doc/libcucul-dev
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html
 	cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \
 	  $(DESTDIR)$(datadir)/doc/libcaca-dev/html
@@ -56,3 +57,6 @@ if BUILD_DOCUMENTATION
 	ln -s cacafire.1 $(DESTDIR)$(mandir)/man1/cacademo.1
 endif
 
+uninstall-local:
+	rm -f $(DESTDIR)$(datadir)/doc/libcucul-dev
+