diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-19 08:53:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-19 08:53:58 +0200 |
| commit | 62d040da7ea0a76d48014b5247d98b428ca50a15 (patch) | |
| tree | d654468cec32beda665bb645ac854ea09279c8c3 /fontconfig | |
| parent | c264407352572f07e31695637d3d78d07ae0bae8 (diff) | |
| parent | 36237c651fab7aa9e65da9c33eb89a619827edff (diff) | |
| download | vcxsrv-62d040da7ea0a76d48014b5247d98b428ca50a15.tar.gz vcxsrv-62d040da7ea0a76d48014b5247d98b428ca50a15.tar.bz2 vcxsrv-62d040da7ea0a76d48014b5247d98b428ca50a15.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/configure.ac (renamed from fontconfig/configure.in) | 0 | ||||
| -rw-r--r-- | fontconfig/new-version.sh | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fontconfig/configure.in b/fontconfig/configure.ac index a8c1f8728..a8c1f8728 100644 --- a/fontconfig/configure.in +++ b/fontconfig/configure.ac diff --git a/fontconfig/new-version.sh b/fontconfig/new-version.sh index 6cf609f29..3c620ae4c 100644 --- a/fontconfig/new-version.sh +++ b/fontconfig/new-version.sh @@ -21,7 +21,7 @@ eval `echo $version | # Update the version numbers -sed -i configure.in -e "/^AM_INIT_AUTOMAKE/s/2\.[0-9.]*/$version/" +sed -i configure.ac -e "/^AM_INIT_AUTOMAKE/s/2\.[0-9.]*/$version/" sed -i fontconfig/fontconfig.h \ -e "/^#define FC_MAJOR/s/[0-9][0-9]*/$major/" \ @@ -105,7 +105,7 @@ if [ $version != $last ]; then fi $test git commit -m"Bump version to $version" \ - configure.in \ + configure.ac \ fontconfig/fontconfig.h \ README |