diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
| commit | 3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064 (patch) | |
| tree | b5487ebc7c6056e0b248afc471edf40b90a3b0b4 /fontconfig/configure.ac | |
| parent | 1245204b2091d108a8688ff7f749f2c6cc830381 (diff) | |
| parent | a12cf779e828ec70da714832e1eaa730119fe10c (diff) | |
| download | vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.gz vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.bz2 vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013
Diffstat (limited to 'fontconfig/configure.ac')
| -rw-r--r-- | fontconfig/configure.ac | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac index 952e73766..4b631bd53 100644 --- a/fontconfig/configure.ac +++ b/fontconfig/configure.ac @@ -588,7 +588,7 @@ no|yes) esac case "$configdir" in no|yes) - configdir='${baseconfigdir}'/conf.d + configdir='${BASECONFIGDIR}'/conf.d ;; *) ;; @@ -605,13 +605,9 @@ TEMPLATEDIR=${templatedir} BASECONFIGDIR=${baseconfigdir} CONFIGDIR=${configdir} XMLDIR=${xmldir} -AC_SUBST(templatedir) AC_SUBST(TEMPLATEDIR) -AC_SUBST(baseconfigdir) AC_SUBST(BASECONFIGDIR) -AC_SUBST(configdir) AC_SUBST(CONFIGDIR) -AC_SUBST(xmldir) AC_SUBST(XMLDIR) |