[SCM] xbmc packaging branch, master, updated. upstream/9.04.1+svn22158.deb1-18-g2b1e7f7

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Mon Oct 12 05:50:32 UTC 2009


The following commit has been merged in the master branch:
commit 15ab0554718ed898c07e77a363987987932dd4e1
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Oct 11 18:06:54 2009 -0400

    Fix issue when doing make distclean when current working directory is inside symlinked directory.

diff --git a/debian/patches/distclean-fix.patch b/debian/patches/distclean-fix.patch
new file mode 100644
index 0000000..84e068f
--- /dev/null
+++ b/debian/patches/distclean-fix.patch
@@ -0,0 +1,10 @@
+Avoid symlinks for pwd.
+==========================================================================
+--- a/Makefile.include.in
++++ b/Makefile.include.in
+@@ -107,4 +107,4 @@
+ distclean:
+ 	$(RM) $(OBJS) *.o $(LIB) $(SLIB) $(STATICLIB) $(CLEAN_FILES) $(DISTCLEAN_FILES) $(PCH:.h=.h.gch) $(OBJS:.o=.P)
+ 	for d in $(DIRS); do (if test -f "$$d/Makefile"; then ($(MAKE) -C "$$d" distclean || $(MAKE) -C "$$d" clean); fi ); done
+-	if [ "$(shell pwd)" = "$(abs_top_srcdir)" ]; then rm -f $(AUTOGENERATED_MAKEFILES) Makefile.include Makefile; fi
++	if [ "$(shell pwd -P)" = "$(abs_top_srcdir)" ]; then rm -f $(AUTOGENERATED_MAKEFILES) Makefile.include Makefile; fi
diff --git a/debian/patches/series b/debian/patches/series
index cafd205..954c37b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# Nothing to patch
+distclean-fix.patch

-- 
xbmc packaging



More information about the pkg-multimedia-commits mailing list