Commit 5b80ce35 authored by Alexandre Julliard's avatar Alexandre Julliard

Fixed make install from read-only build directory (spotted by Marcus

Meissner).
parent 3c43df8a
......@@ -104,7 +104,7 @@ install::
# Dependencies between directories
all: dlls library miscemu ole programs server tools tsx11 unicode
all: $(SUBDIRS)
dlls: library ole tools tsx11 unicode
server: library tools unicode
miscemu programs: dlls library ole tools tsx11 unicode
......
......@@ -195,7 +195,7 @@ http://home.nexgo.de/andi.mohr/download/decorrupt_explorer
Some documentation (various Wine Guides etc.) can be found in the
documentation/ directory (apart from also being available on WineHQ).
If you want to process the SGML files in there, then you can run "make"
If you want to process the SGML files in there, then you can run "make doc"
in the documentation/ directory.
Doing so requires the sgml tools package (for db2html, db2ps, db2pdf) named:
Debian: docbook-utils
......
......@@ -726,6 +726,7 @@ urlmon/__install__: urlmon.dll$(DLLEXT)
user/__install__: user32.dll$(DLLEXT)
version/__install__: version.dll$(DLLEXT)
win32s/__install__: w32skrnl.dll$(DLLEXT)
winmm/winealsa/__install__: winealsa.drv$(DLLEXT)
winmm/winearts/__install__: winearts.drv$(DLLEXT)
winedos/__install__: winedos.dll$(DLLEXT)
msacm/winemp3/__install__: winemp3.acm$(DLLEXT)
......@@ -855,16 +856,16 @@ x11drv: user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.
LINKABLE_DLLS = ntdll.dll gdi32.dll user32.dll kernel32.dll
libntdll.dll.$(LIBEXT): ntdll
libntdll.dll.$(LIBEXT): ntdll/ntdll.dll$(DLLEXT)
$(RM) $@ && $(LN_S) ntdll/ntdll.dll$(DLLEXT) $@
libgdi32.dll.$(LIBEXT): gdi
libgdi32.dll.$(LIBEXT): gdi/gdi32.dll$(DLLEXT)
$(RM) $@ && $(LN_S) gdi/gdi32.dll$(DLLEXT) $@
libuser32.dll.$(LIBEXT): user
libuser32.dll.$(LIBEXT): user/user32.dll$(DLLEXT)
$(RM) $@ && $(LN_S) user/user32.dll$(DLLEXT) $@
libkernel32.dll.$(LIBEXT): kernel
libkernel32.dll.$(LIBEXT): kernel/kernel32.dll$(DLLEXT)
$(RM) $@ && $(LN_S) kernel/kernel32.dll$(DLLEXT) $@
uninstall::
......
......@@ -253,7 +253,7 @@ printf NEWMAKE "LINKABLE_DLLS = %s\n\n", join( " ", keys %linkable_dlls );
foreach my $mod (keys %linkable_dlls)
{
printf NEWMAKE "lib%s.\$(LIBEXT): %s\n", $mod, $directories{$mod};
printf NEWMAKE "lib%s.\$(LIBEXT): %s/%s\$(DLLEXT)\n", $mod, $directories{$mod}, $mod;
printf NEWMAKE "\t\$(RM) \$@ && \$(LN_S) %s/%s\$(DLLEXT) \$@\n\n", $directories{$mod}, $mod;
}
......
......@@ -51,10 +51,18 @@ BOOK_TARGETS = \
$(BOOKNAME).pdf \
$(BOOKNAME).ps
all: $(MAN_TARGETS) $(BOOK_TARGETS)
all: $(MAN_TARGETS)
@MAKE_RULES@
everything: $(MAN_TARGETS) $(BOOK_TARGETS)
doc: $(BOOK_TARGETS)
html: $(BOOKNAME)/index.html
pdf: $(BOOKNAME).pdf
ps: $(BOOKNAME).ps
.PHONY: everything doc html pdf ps
$(BOOKNAME)/index.html: $(BOOK_SRCS)
$(DB2HTML) $(BOOKNAME).sgml
......
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