Skip to content

Commit 443a0a4

Browse files
committed
Add conditional definitions
1 parent 9b9001f commit 443a0a4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cmake/main/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,10 @@ function(_php_main_create_files)
288288
)
289289

290290
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
291-
set(EXPANDED_MANDIR "")
291+
set(PHP_MANDIR "")
292292
else()
293293
set(
294-
EXPANDED_MANDIR
294+
PHP_MANDIR
295295
"$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_MANDIR},${CMAKE_INSTALL_PREFIX}>"
296296
)
297297
endif()
@@ -397,7 +397,7 @@ function(_php_main_create_files)
397397
prefix "$<INSTALL_PREFIX>"
398398
EXPANDED_BINDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},$<INSTALL_PREFIX>>"
399399
EXPANDED_SBINDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SBINDIR},$<INSTALL_PREFIX>>"
400-
EXPANDED_MANDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_MANDIR},$<INSTALL_PREFIX>>"
400+
PHP_MANDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_MANDIR},$<INSTALL_PREFIX>>"
401401
EXPANDED_LIBDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_LIBDIR},$<INSTALL_PREFIX>>"
402402
EXPANDED_DATADIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_DATADIR},$<INSTALL_PREFIX>>"
403403
EXPANDED_SYSCONFDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SYSCONFDIR},$<INSTALL_PREFIX>>"

cmake/main/cmake/build-defs.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
the stage installation directory and the other for production. */
88

99
/* Command used for configuring PHP at build phase. */
10-
#define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
10+
#cmakedefine CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
1111

1212
/* The path to the PEAR installation directory. */
1313
#define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@"
@@ -44,7 +44,7 @@
4444
#define PHP_LOCALSTATEDIR "@EXPANDED_LOCALSTATEDIR@"
4545

4646
/* The path to the directory containing man documentation. */
47-
#cmakedefine PHP_MANDIR "@EXPANDED_MANDIR@"
47+
#cmakedefine PHP_MANDIR "@PHP_MANDIR@"
4848

4949
/* The PHP installation prefix. */
5050
#define PHP_PREFIX "@prefix@"

0 commit comments

Comments
 (0)