pidgin: 1e5b04b8: Fix make distcheck (which broke from an ...

sadrul at pidgin.im sadrul at pidgin.im
Sat Apr 26 00:45:42 EDT 2008


-----------------------------------------------------------------
Revision: 1e5b04b80af9564fe43dce4e0d38007f759abc9f
Ancestor: be1ef7da9fe0adc011b759cfe1a4f2e2b2785108
Author: sadrul at pidgin.im
Date: 2008-04-26T00:43:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1e5b04b80af9564fe43dce4e0d38007f759abc9f

Modified files:
        libpurple/plugins/perl/Makefile.am
        pidgin/plugins/perl/Makefile.am

ChangeLog: 

Fix make distcheck (which broke from an earlier fix for make when
building in a different directory). References #5614.

-------------- next part --------------
============================================================
--- libpurple/plugins/perl/Makefile.am	3d6eed26f7919fc7328d0d005721791f68f08f00
+++ libpurple/plugins/perl/Makefile.am	f60600face567614b375d8f6d7dec8944b333657
@@ -90,7 +90,9 @@ common/Makefile: common/Makefile.PL
 common/Makefile: common/Makefile.PL
 	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
-			${LN_S} -f ${srcdir}/$$f $$f; \
+			srcloc=${srcdir}; \
+			case $$srcloc in /*) ;; *) srcloc=../${srcdir} ;; esac; \
+			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
 	@cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS)
@@ -148,7 +150,9 @@ distclean-generic:
 
 	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
-			${LN_S} -f ${srcdir}/$$f $$f; \
+			srcloc=${srcdir}; \
+			case $$srcloc in /*) ;; *) srcloc=../${srcdir} ;; esac; \
+			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
 
============================================================
--- pidgin/plugins/perl/Makefile.am	046ab3d3d0829aaa66c02be0d65e0fdc4ccbad16
+++ pidgin/plugins/perl/Makefile.am	d8a7c7064afb5bfa57c47a5da41ec6d125499e99
@@ -39,7 +39,9 @@ common/Makefile: common/Makefile.PL
 common/Makefile: common/Makefile.PL
 	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
 		for f in ${common_sources}; do \
-			${LN_S} -f ../${srcdir}/$$f $$f; \
+			srcloc=${srcdir}; \
+			case $$srcloc in /*) ;; *) srcloc=../${srcdir} ;; esac; \
+			${LN_S} -f $$srcloc/$$f $$f; \
 		done; \
 	fi
 	@cd common && $(perlpath) Makefile.PL $(PERL_MM_PARAMS)


More information about the Commits mailing list