diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-08-20 01:18:14 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-08-20 01:18:14 +0000 |
| commit | 4f4e1a286aff707161b4ac1346c872b809254781 (patch) | |
| tree | 268af5380cd892afcf0779094a8f5a43ad967e49 | |
| parent | Support compiling ScriptExec on newer versions of OS X (please review) (diff) | |
| download | inkscape-4f4e1a286aff707161b4ac1346c872b809254781.tar.gz inkscape-4f4e1a286aff707161b4ac1346c872b809254781.zip | |
osx-build.sh: don't hard-code LIBPREFIX, other minor changes
(bzr r13506.1.7)
| -rwxr-xr-x | packaging/macosx/osx-build.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index a536adf64..a3e87c0e7 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -22,9 +22,11 @@ # User modifiable parameters #---------------------------------------------------------- # Configure flags -CONFFLAGS="--disable-openmp --enable-osxapp" +CONFFLAGS="--enable-osxapp --enable-localinstall" # Libraries prefix (Warning: NO trailing slash) -LIBPREFIX="/opt/local-x11" +if [ -z "$LIBPREFIX" ]; then + LIBPREFIX="/opt/local-x11" +fi ############################################################ @@ -151,7 +153,7 @@ done # Set environment variables # ---------------------------------------------------------- -export LIBPREFIX="/opt/local-x11" +export LIBPREFIX # Specific environment variables # automake seach path @@ -160,8 +162,8 @@ export CPATH="$LIBPREFIX/include" export CPPFLAGS="-I$LIBPREFIX/include" export LDFLAGS="-L$LIBPREFIX/lib" # compiler arguments -export CFLAGS="-O0 -Wall" -export CXXFLAGS="$CFLAGS" +export CFLAGS="-pipe -Os" +export CXXFLAGS="$CFLAGS -Wno-cast-align" # Actions # ---------------------------------------------------------- |