diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-01 15:10:19 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-01 15:10:32 +0100 |
| commit | 982f199a98a7d82e0109077882a645f1a442049e (patch) | |
| tree | 733bef575b66d224fc4c03cfecf69f86b1fbed27 /configure.ac | |
| parent | 8fc14413d9dadede63743ec76603d95eb587f580 (diff) | |
Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink
Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 3193342e6cae..ae82b5647d17 100644 --- a/configure.ac +++ b/configure.ac @@ -3025,7 +3025,7 @@ if test $_os = Darwin; then LIBO_URE_BIN_FOLDER=MacOS LIBO_URE_ETC_FOLDER=Resources/ure/etc LIBO_URE_LIB_FOLDER=Frameworks - LIBO_URE_SHARE_FOLDER=Resources/ure/share + LIBO_URE_MISC_FOLDER=Resources/ure/share/misc LIBO_URE_SHARE_JAVA_FOLDER=Resources/java elif test $_os = WINNT; then LIBO_BIN_FOLDER=program @@ -3042,7 +3042,7 @@ elif test $_os = WINNT; then LIBO_URE_BIN_FOLDER=URE/bin LIBO_URE_ETC_FOLDER=URE/bin LIBO_URE_LIB_FOLDER=URE/bin - LIBO_URE_SHARE_FOLDER=URE + LIBO_URE_MISC_FOLDER=URE/misc LIBO_URE_SHARE_JAVA_FOLDER=URE/java else LIBO_BIN_FOLDER=program @@ -3059,7 +3059,7 @@ else LIBO_URE_BIN_FOLDER=program LIBO_URE_ETC_FOLDER=program LIBO_URE_LIB_FOLDER=program - LIBO_URE_SHARE_FOLDER=ure/share + LIBO_URE_MISC_FOLDER=program LIBO_URE_SHARE_JAVA_FOLDER=program/classes fi AC_DEFINE_UNQUOTED(LIBO_BIN_FOLDER,"$LIBO_BIN_FOLDER") @@ -3076,7 +3076,7 @@ AC_DEFINE_UNQUOTED(LIBO_SHARE_SHELL_FOLDER,"$LIBO_SHARE_SHELL_FOLDER") AC_DEFINE_UNQUOTED(LIBO_URE_BIN_FOLDER,"$LIBO_URE_BIN_FOLDER") AC_DEFINE_UNQUOTED(LIBO_URE_ETC_FOLDER,"$LIBO_URE_ETC_FOLDER") AC_DEFINE_UNQUOTED(LIBO_URE_LIB_FOLDER,"$LIBO_URE_LIB_FOLDER") -AC_DEFINE_UNQUOTED(LIBO_URE_SHARE_FOLDER,"$LIBO_URE_SHARE_FOLDER") +AC_DEFINE_UNQUOTED(LIBO_URE_MISC_FOLDER,"$LIBO_URE_MISC_FOLDER") AC_DEFINE_UNQUOTED(LIBO_URE_SHARE_JAVA_FOLDER,"$LIBO_URE_SHARE_JAVA_FOLDER") # Not all of them needed in config_host.mk, add more if need arises @@ -3092,7 +3092,7 @@ AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER) AC_SUBST(LIBO_URE_BIN_FOLDER) AC_SUBST(LIBO_URE_ETC_FOLDER) AC_SUBST(LIBO_URE_LIB_FOLDER) -AC_SUBST(LIBO_URE_SHARE_FOLDER) +AC_SUBST(LIBO_URE_MISC_FOLDER) AC_SUBST(LIBO_URE_SHARE_JAVA_FOLDER) dnl =================================================================== |