Commit 57ed75bf authored by Alexandre Julliard's avatar Alexandre Julliard

wineps: Renamed the directory to wineps.drv.

parent 3aebbdcd
...@@ -1486,7 +1486,7 @@ WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv) ...@@ -1486,7 +1486,7 @@ WINE_CONFIG_EXTRA_DIR(dlls/gdi/enhmfdrv)
WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi/mfdrv)
WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages) WINE_CONFIG_EXTRA_DIR(dlls/kernel/messages)
WINE_CONFIG_EXTRA_DIR(dlls/user/resources) WINE_CONFIG_EXTRA_DIR(dlls/user/resources)
WINE_CONFIG_EXTRA_DIR(dlls/wineps/data) WINE_CONFIG_EXTRA_DIR(dlls/wineps.drv/data)
WINE_CONFIG_EXTRA_DIR(include/wine) WINE_CONFIG_EXTRA_DIR(include/wine)
MAKE_RULES=Make.rules MAKE_RULES=Make.rules
...@@ -1720,7 +1720,7 @@ dlls/winecrt0/Makefile ...@@ -1720,7 +1720,7 @@ dlls/winecrt0/Makefile
dlls/wined3d/Makefile dlls/wined3d/Makefile
dlls/winedos/Makefile dlls/winedos/Makefile
dlls/winemp3.acm/Makefile dlls/winemp3.acm/Makefile
dlls/wineps/Makefile dlls/wineps.drv/Makefile
dlls/wininet/Makefile dlls/wininet/Makefile
dlls/wininet/tests/Makefile dlls/wininet/tests/Makefile
dlls/winmm/Makefile dlls/winmm/Makefile
......
...@@ -163,7 +163,7 @@ BASEDIRS = \ ...@@ -163,7 +163,7 @@ BASEDIRS = \
w32skrnl \ w32skrnl \
winedos \ winedos \
winemp3.acm \ winemp3.acm \
wineps \ wineps.drv \
wininet \ wininet \
winmm \ winmm \
winmm/joystick \ winmm/joystick \
...@@ -279,7 +279,6 @@ SYMLINKS_SO = \ ...@@ -279,7 +279,6 @@ SYMLINKS_SO = \
winejack.drv.so \ winejack.drv.so \
winenas.drv.so \ winenas.drv.so \
wineoss.drv.so \ wineoss.drv.so \
wineps.drv.so \
winspool.drv.so winspool.drv.so
# Main target # Main target
...@@ -333,9 +332,6 @@ winenas.drv.so: winmm/winenas/winenas.drv.so ...@@ -333,9 +332,6 @@ winenas.drv.so: winmm/winenas/winenas.drv.so
wineoss.drv.so: winmm/wineoss/wineoss.drv.so wineoss.drv.so: winmm/wineoss/wineoss.drv.so
$(RM) $@ && $(LN_S) winmm/wineoss/wineoss.drv.so $@ $(RM) $@ && $(LN_S) winmm/wineoss/wineoss.drv.so $@
wineps.drv.so: wineps/wineps.drv.so
$(RM) $@ && $(LN_S) wineps/wineps.drv.so $@
winex11.drv.so: x11drv/winex11.drv.so winex11.drv.so: x11drv/winex11.drv.so
$(RM) $@ && $(LN_S) x11drv/winex11.drv.so $@ $(RM) $@ && $(LN_S) x11drv/winex11.drv.so $@
...@@ -927,7 +923,6 @@ winmm/wineesd/wineesd.drv.so: winmm/wineesd ...@@ -927,7 +923,6 @@ winmm/wineesd/wineesd.drv.so: winmm/wineesd
winmm/winejack/winejack.drv.so: winmm/winejack winmm/winejack/winejack.drv.so: winmm/winejack
winmm/winenas/winenas.drv.so: winmm/winenas winmm/winenas/winenas.drv.so: winmm/winenas
winmm/wineoss/wineoss.drv.so: winmm/wineoss winmm/wineoss/wineoss.drv.so: winmm/wineoss
wineps/wineps.drv.so: wineps
x11drv/winex11.drv.so: x11drv x11drv/winex11.drv.so: x11drv
winspool/winspool.drv.so: winspool winspool/winspool.drv.so: winspool
dxerr8/libdxerr8.a: dxerr8 dxerr8/libdxerr8.a: dxerr8
......
...@@ -623,7 +623,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name) ...@@ -623,7 +623,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name)
const char *data_dir, *filename; const char *data_dir, *filename;
if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd";
else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps/generic.ppd"; else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd";
else else
{ {
res = ERROR_FILE_NOT_FOUND; res = ERROR_FILE_NOT_FOUND;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment