[Libreoffice-commits] core.git: sysui/CustomTarget_slackware.mk

Tor Lillqvist tml at iki.fi
Tue Feb 19 11:20:43 PST 2013


 sysui/CustomTarget_slackware.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 23977d63752b410ce273cab09ba98431ab89dcf4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Feb 19 21:20:14 2013 +0200

    GNUTAR is run at build time so check OS_FOR_BUILD instead of OS
    
    Change-Id: Ib8cfcda3f7688797e2cb5aee75d36515548e7de9

diff --git a/sysui/CustomTarget_slackware.mk b/sysui/CustomTarget_slackware.mk
index 75daa65..e5145fe 100644
--- a/sysui/CustomTarget_slackware.mk
+++ b/sysui/CustomTarget_slackware.mk
@@ -23,7 +23,7 @@ $(foreach product,$(PRODUCTLIST),\
 
 $(slack_WORKDIR)/empty.tar:
 	mkdir $(slack_WORKDIR)/empty
-	$(GNUTAR) -C $(slack_WORKDIR)/empty --owner=root $(if $(filter-out MACOSX,$(OS)),--group=root) --same-owner -cf $@ .
+	$(GNUTAR) -C $(slack_WORKDIR)/empty --owner=root $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--group=root) --same-owner -cf $@ .
 
 $(slack_WORKDIR)/%/install/doinst.sh: $(slack_SRCDIR)/update-script $(call gb_CustomTarget_get_workdir,sysui/share)/%/launcherlist
 	echo "( cd etc; rm -rf $(UNIXFILENAME.$*) )" > $@
@@ -52,7 +52,7 @@ $(slack_WORKDIR)/%$(PRODUCTVERSION)-slackware-menus-$(PKGVERSION)-noarch-$(LIBO_
            GNOMEDIR="" \
            ./create_tree.sh
 	cp $(slack_WORKDIR)/empty.tar $@.tmp
-	$(GNUTAR) -C $(slack_WORKDIR)/$* --owner=root $(if $(filter-out MACOSX,$(OS)),--group=root) --same-owner \
+	$(GNUTAR) -C $(slack_WORKDIR)/$* --owner=root $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--group=root) --same-owner \
 		-rf $@.tmp install usr opt
 	gzip < $@.tmp > $@
 


More information about the Libreoffice-commits mailing list