makedep: Don't expand variable references that use ${}.

This commit is contained in:
Alexandre Julliard 2014-01-04 20:33:57 +01:00
parent 9c2725d5d6
commit ce25c89585
7 changed files with 20 additions and 15 deletions

View File

@ -6,12 +6,11 @@ bindir = @bindir@
libdir = @libdir@
datarootdir = @datarootdir@
datadir = @datadir@
infodir = @infodir@
mandir = @mandir@
fontdir = $(datadir)/wine/fonts
fontdir = ${datadir}/wine/fonts
includedir = @includedir@/wine
dlldir = @dlldir@
fakedlldir = $(dlldir)/fakedlls
fakedlldir = ${dlldir}/fakedlls
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
srcdir = @srcdir@

View File

@ -1,7 +1,7 @@
MODULE = appwiz.cpl
IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 user32 comdlg32
DELAYIMPORTS = msi
EXTRADEFS = -DINSTALL_DATADIR="\"$(datadir)\""
EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\""
C_SRCS = \
addons.c \

View File

@ -1,12 +1,12 @@
EXTRALIBS = $(LIBPORT) @LIBDL@ @COREFOUNDATIONLIB@ @CORESERVICESLIB@
EXTRADEFS = -DWINE_UNICODE_API="" \
-DBINDIR='"$(bindir)"' \
-DDLLDIR='"$(dlldir)"' \
-DBINDIR='"${bindir}"' \
-DDLLDIR='"${dlldir}"' \
-DDLLPREFIX='"$(DLLPREFIX)"' \
-DLIB_TO_BINDIR=\"`$(MAKEDEP) -R $(libdir) $(bindir)`\" \
-DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R $(libdir) $(dlldir)`\" \
-DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R $(bindir) $(dlldir)`\" \
-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R $(bindir) $(datadir)/wine`\"
-DLIB_TO_BINDIR=\"`$(MAKEDEP) -R ${libdir} ${bindir}`\" \
-DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R ${libdir} ${dlldir}`\" \
-DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \
-DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\"
STATICLIB = libwine_static.a
C_SRCS = \

View File

@ -1157,6 +1157,12 @@ static char *get_expanded_make_variable( const char *name )
tmp = replace_substr( expand, p, end - p, var ? var : "" );
free( var );
}
else if (p[1] == '{') /* don't expand ${} variables */
{
if (!(end = strchr( p + 2, '}' ))) fatal_error( "syntax error in '%s'\n", expand );
p = end + 1;
continue;
}
else if (p[1] == '$')
{
tmp = replace_substr( expand, p, 2, "$" );

View File

@ -19,7 +19,7 @@ C_SRCS = \
LEX_SRCS = parser.l
BISON_SRCS = parser.y
EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"$(includedir)/windows/\"
EXTRADEFS = -DDEFAULT_INCLUDE_DIR=\"${includedir}/windows/\"
@MAKE_RULES@

View File

@ -1,7 +1,7 @@
EXTRADEFS = \
-DINCLUDEDIR="\"$(includedir)\"" \
-DDLLDIR="\"$(dlldir)\"" \
-DLIBDIR="\"$(libdir)\"" \
-DINCLUDEDIR="\"${includedir}\"" \
-DDLLDIR="\"${dlldir}\"" \
-DLIBDIR="\"${libdir}\"" \
-DCC="\"$(CC)\"" \
-DCPP="\"@CPPBIN@\"" \
-DCXX="\"@CXX@\"" \

View File

@ -1,4 +1,4 @@
EXTRADEFS = -DINCLUDEDIR="\"$(includedir)\""
EXTRADEFS = -DINCLUDEDIR="\"${includedir}\""
PROGRAMS = wrc$(EXEEXT)
MANPAGES = wrc.man.in
ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)