diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-16 10:10:57 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-16 18:25:18 +0000 |
| commit | be421269f95446307d1168e17e1fe9ee7d9a0a66 (patch) | |
| tree | 491fa90929828589d390e994b3e9f841672d22ea /configure.ac | |
| parent | baffab9a4ffca9a4940a3310937d6e858e66cc1f (diff) | |
move headers from solenv/inc/ to include/
Change-Id: Ieb6cba645b3535f7d683d2aefa5599d04d9994f3
Reviewed-on: https://gerrit.libreoffice.org/3403
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 64e574e72c02..d2db9e76d94a 100644 --- a/configure.ac +++ b/configure.ac @@ -3769,7 +3769,6 @@ linux-android*) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) ;; esac - SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/$OUTPATH" SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib" ;; @@ -3801,7 +3800,7 @@ mingw*) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) ;; esac - SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/win32 -I$SRC_ROOT/solenv/inc/$OUTPATH" + SOLARINC="$SOLARINC -I$SRC_ROOT/include/wntgcci" SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib" ;; @@ -3941,7 +3940,7 @@ else INSTDIR=${BUILDDIR}/instdir/${INPATH} fi OUTDIR="${SOLARVER}/${INPATH}" -SOLARINC="-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I${INSTDIR}/${SDKDIR}/include -I$SRC_ROOT/solenv/inc $SOLARINC" +SOLARINC="-I. -I$SRC_ROOT/include -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I${INSTDIR}/${SDKDIR}/include $SOLARINC" AC_SUBST(COM) AC_SUBST(CPU) AC_SUBST(CPUNAME) |