diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-16 19:26:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-16 19:26:40 +0000 |
| commit | 4e370208d0f941a4cceb6f9fefa78444c2bf3498 (patch) | |
| tree | 543c693b5dee03c965b0c9ef79869a8536024432 /freetype/configure | |
| parent | 1eaf4b3f1d746b054298358d81233364bb1b7ba2 (diff) | |
| parent | 2177eb8fad173f2b0fe04f188c4d6dadaa8f4441 (diff) | |
| download | vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.gz vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.bz2 vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'freetype/configure')
| -rw-r--r-- | freetype/configure | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/freetype/configure b/freetype/configure index 2efa26967..b39755624 100644 --- a/freetype/configure +++ b/freetype/configure @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009 by +# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -78,10 +78,15 @@ if test $# -gt 0; then done fi -# build a dummy Makefile if we are not building in the source tree +# build a dummy Makefile if we are not building in the source tree; +# we use inodes to avoid issues with symbolic links +inode_src=`ls -id $abs_ft2_dir | awk '{print $1}'` +inode_dst=`ls -id $abs_curr_dir | awk '{print $1}'` -if test "$abs_curr_dir" != "$abs_ft2_dir"; then - mkdir reference +if test $inode_src -ne $inode_dst; then + if test ! -d reference; then + mkdir reference + fi if test ! -r $abs_curr_dir/modules.cfg; then echo "Copying \`modules.cfg'" cp $abs_ft2_dir/modules.cfg $abs_curr_dir @@ -91,7 +96,7 @@ if test "$abs_curr_dir" != "$abs_ft2_dir"; then echo "OBJ_DIR := $abs_curr_dir" >> Makefile echo "OBJ_BUILD := \$(OBJ_DIR)" >> Makefile echo "DOC_DIR := \$(OBJ_DIR)/reference" >> Makefile - echo "LIBTOOL := \$(OBJ_DIR)/libtool" >> Makefile + echo "FT_LIBTOOL_DIR := \$(OBJ_DIR)" >> Makefile echo "ifndef FT2DEMOS" >> Makefile echo " include \$(TOP_DIR)/Makefile" >> Makefile echo "else" >> Makefile |