sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79813 by Arwed von Merkatz for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79813 by Arwed von Merkatz for review
Date: Thu, 25 May 2006 16:35:02 +0100 (BST)

Change 79813 by arwed_von_merkatz@arwed-Otherland on 2006/05/25 16:33:20

work with both make 3.80 and 3.81

Affected files ...

... //sgl/grimoires/test/video-libs/libmpeg3/HISTORY#10 integrate
... //sgl/grimoires/test/video-libs/libmpeg3/PRE_BUILD#3 integrate

Differences ...

==== //sgl/grimoires/test/video-libs/libmpeg3/HISTORY#10 (text) ====

@@ -1,3 +1,7 @@
+2006-05-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: only apply the previous fix if make is at version 3.81,
+ bug #12071
+
2006-05-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: replace \; by ; in $(shell line in Makefile so it
works with make 3.81

==== //sgl/grimoires/test/video-libs/libmpeg3/PRE_BUILD#3 (xtext) ====

@@ -2,5 +2,7 @@
cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/Makefile-shared.patch &&
patch -p0 < $SCRIPT_DIRECTORY/libmpeg3-fixes.patch &&
-# fix Makefile to work with make 3.81
-sedit 's/\\;/;/g' Makefile
+if make -v | grep -q 3.81; then
+ # fix Makefile to work with make 3.81
+ sedit 's/\\;/;/g' Makefile
+fi

[SM-Commit] PERFORCE change 79813 by Arwed von Merkatz for review, Perforce Review Daemon, 05/25/2006