[vlc-devel] [PATCH 06/19] contrib: caca: make use of the detected ln -s from the configure script

[Steve Lhomme]

---
 contrib/src/caca/caca-ln-fix.patch | 61 ++++++++++++++++++++++++++++++++++++++
 contrib/src/caca/rules.mak         |  2 ++
 2 files changed, 63 insertions(+)
 create mode 100644 contrib/src/caca/caca-ln-fix.patch

diff --git a/contrib/src/caca/caca-ln-fix.patch b/contrib/src/caca/caca-ln-fix.patch
new file mode 100644
index 0000000000..6bbd6a0ac1
--- /dev/null
+++ b/contrib/src/caca/caca-ln-fix.patch
@@ -0,0 +1,61 @@
+--- caca/caca/Makefile.am	2017-06-14 09:59:00.383358300 +0200
++++ caca/caca/Makefile.am.ln	2017-06-14 09:57:44.581968600 +0200
+@@ -77,15 +77,15 @@ install-exec-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	. ./libcaca.la || exit 1; \
+ 	for x in $$library_names; do \
+-	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
++	  $(LN_S) -f  $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+ 	done
+-	ln -sf libcaca.la $(DESTDIR)$(libdir)/libcucul.la
++	$(LN_S) -f  libcaca.la $(DESTDIR)$(libdir)/libcucul.la
+ 
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
+-	ln -sf caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
++	$(LN_S) -f caca.pc $(DESTDIR)$(pkgconfigdir)/cucul.pc
+ 	$(mkinstalldirs) $(DESTDIR)$(includedir)
+-	ln -sf caca.h $(DESTDIR)$(includedir)/cucul.h
++	$(LN_S) -f  caca.h $(DESTDIR)$(includedir)/cucul.h
+ 
+ uninstall-local:
+ 	. ./libcaca.la || exit 1; \
+--- caca/cxx/Makefile.am	2017-06-14 09:58:58.185600500 +0200
++++ caca/cxx/Makefile.am.ln	2017-06-14 09:57:45.309510000 +0200
+@@ -26,13 +26,13 @@ install-exec-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	. ./libcaca++.la || exit 1; \
+ 	for x in $$library_names; do \
+-	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
++	  $(LN_S) -f  $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+ 	done
+-	ln -sf libcaca++.la $(DESTDIR)$(libdir)/libcucul++.la
++	$(LN_S) -f  libcaca++.la $(DESTDIR)$(libdir)/libcucul++.la
+ 
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
+-	ln -sf caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
++	$(LN_S) -f  caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
+ endif
+ 
+ uninstall-local:
+--- caca/doc/Makefile.am	2017-06-14 09:58:55.564656700 +0200
++++ caca/doc/Makefile.am.ln	2017-06-14 09:57:45.983921100 +0200
+@@ -42,7 +42,7 @@ clean-local:
+ install-data-local:
+ if BUILD_DOCUMENTATION
+ 	mkdir -p $(DESTDIR)$(datadir)/doc
+-	ln -sf libcaca-dev $(DESTDIR)$(datadir)/doc/libcucul-dev
++	$(LN_S) -f  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
+@@ -54,7 +54,7 @@ if BUILD_DOCUMENTATION
+ endif
+ 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
+ 	rm -f $(DESTDIR)$(mandir)/man1/cacademo.1
+-	ln -sf cacafire.1 $(DESTDIR)$(mandir)/man1/cacademo.1
++	$(LN_S) -f  cacafire.1 $(DESTDIR)$(mandir)/man1/cacademo.1
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(datadir)/doc/libcucul-dev
diff --git a/contrib/src/caca/rules.mak b/contrib/src/caca/rules.mak
index b04c3f3a8f..aeb6ca8523 100644
--- a/contrib/src/caca/rules.mak
+++ b/contrib/src/caca/rules.mak
@@ -20,6 +20,7 @@ caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca
 	$(APPLY) $(SRC)/caca/caca-llvm-weak-alias.patch
 	$(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch
 	$(APPLY) $(SRC)/caca/caca-win32-static.patch
+	$(APPLY) $(SRC)/caca/caca-ln-fix.patch
 	$(MOVE)
 
 CACA_CONF := \
@@ -38,6 +39,7 @@ CACA_CONF += --disable-ncurses
 endif
 
 .caca: caca
+	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(CACA_CONF)
 	cd $< && $(MAKE) -C $< install
 	touch $@
-- 
2.12.1