Permalink
Browse files

Merge branch 'master' of github.com:GPGTools/MacGPG1

Conflicts:
	Installer/INSTALLER.txt
	Installer/MacGPG1.pkgproj
	Makefile.config
  • Loading branch information...
2 parents 0b17000 + 9f8fca0 commit f5a6b2da93d8bbcabd9c72e598286ed7ecba6fe1 @AlexanderWillner AlexanderWillner committed Apr 12, 2011
Showing with 9 additions and 8 deletions.
  1. +1 −2 Installer/INSTALLER.txt
  2. +1 −1 Installer/MacGPG1.pkgproj
  3. +2 −1 Installer/postflight.sh
  4. +1 −1 Makefile.config
  5. +4 −3 build-script.sh
View
@@ -1,5 +1,4 @@
-Thank you for installing MacGPG1
-Version: 1.4.11-6b1
+Thank you for installing MacGPG1 (version 1.4.11-5).
This will allow you to use OpenPGP on OS X.
@@ -533,7 +533,7 @@
<key>RELOCATABLE</key>
<false/>
<key>VERSION</key>
- <string>1.4.11-6b1</string>
+ <string>1.4.11-5</string>
</dict>
<key>UUID</key>
<string>5BCCF690-7295-423B-89B3-5BAC72D8B16A</string>
View
@@ -3,6 +3,7 @@
stdDir="/usr/local";
gpgDir="/usr/local/MacGPG1";
-[ -f $stdDir/bin/gpg ] || ln -s $gpgDir/bin/gpg $stdDir/bin/gpg
+[ -L $stdDir/bin/gpg ] && rm $stdDir/bin/gpg
+[ -f $stdDir/bin/gpg ] || ln -s $gpgDir/bin/gpg $stdDir/bin/gpg
exit 0
View
@@ -1,6 +1,6 @@
name="MacGPG1"
volumeName="$name"
-version="1.4.11-6b1"
+version="1.4.11-5"
appName="$name.pkg"
appPath="build/$name.pkg"
bundleName="$name.pkg"
View
@@ -36,9 +36,10 @@ fi
tar -xzf "$version$fileExt";
cd "$version";
-
-./configure CFLAGS="-arch ppc -arch x86_64 -arch i386" --disable-dependency-tracking --disable-asm --prefix="$target" && \
-make && \
+export MACOSX_DEPLOYMENT_TARGET="10.5"
+export CFLAGS="-mmacosx-version-min=10.5 -DUNIX -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch i386 -arch ppc"
+./configure --enable-static=yes --disable-endian-check --disable-dependency-tracking --disable-asm --enable-osx-universal-binaries --prefix="$target" && \
+make -j2 && \
make check
if [ "$?" != "0" ]; then

0 comments on commit f5a6b2d

Please sign in to comment.