diff --git a/Make.rules.in b/Make.rules.in index 9ce72d1cf66..72202457b64 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -106,6 +106,7 @@ mandir = @mandir@ sysconfdir = @sysconfdir@ includedir = @includedir@/wine dlldir = @libdir@/wine +fakedlldir = $(dlldir)/fakedlls prog_manext = 1 api_manext = 3w conf_manext = 5 diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index a2c981ee076..ab7e8fdb864 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -21,7 +21,7 @@ IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) IMPORTLIBFILE = $(IMPORTLIB:%=lib%.@IMPLIBEXT@) STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a) DLL_LDPATH = -L$(DLLDIR) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(IMPORTS:%=-L$(DLLDIR)/%) -INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(datadir)/wine +INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(datadir)/wine @MAKE_RULES@ @@ -89,13 +89,24 @@ install_static_implib_a: $(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) -install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) +.PHONY: install_dll install_dll.so install_dll.fake + +install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy + $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) + +install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy + $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so + +install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy + $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) + +install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT) install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) dummy uninstall:: -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIBFILE) $(STATICIMPLIB) + $(RM) $(DESTDIR)$(fakedlldir)/$(MODULE) # Misc. rules diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 8f2a9779bcc..3ff953cf2db 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -849,7 +849,7 @@ install install-lib:: @WIN16_INSTALL@ uninstall:: -cd $(DESTDIR)$(dlldir) && $(RM) $(WIN16_FILES) - -rmdir $(DESTDIR)$(dlldir) + -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) clean:: $(RM) $(IMPORT_SYMLINKS) $(WIN16_FILES) diff --git a/programs/Makefile.in b/programs/Makefile.in index fcfeb508d6d..b339aa31a00 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -37,7 +37,7 @@ install-progs: # nothing to do here uninstall:: -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) - -rmdir $(DESTDIR)$(dlldir) + -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) # Rules for testing diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 4fc20936cf0..61357718082 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -13,7 +13,7 @@ DLLFLAGS = @DLLFLAGS@ DEFS = $(EXTRADEFS) ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS) RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR) -INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(prog_manext) +INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext) @MAKE_RULES@ @@ -30,23 +30,21 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) # Rules for installation -.PHONY: install_prog install_prog.so uninstall_prog uninstall_prog.so +.PHONY: install_prog install_prog.so install_prog.fake install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so +install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy + $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) + install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE) -uninstall_prog.so: dummy - $(RM) $(DESTDIR)$(dlldir)/$(MODULE).so +install install-lib:: install_prog$(DLLEXT) install_prog$(FAKEEXT) -uninstall_prog: dummy - $(RM) $(DESTDIR)$(bindir)/$(MODULE) - -install install-lib:: install_prog$(DLLEXT) - -uninstall:: uninstall_prog$(DLLEXT) +uninstall:: + $(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) clean:: $(RM) $(MODULE)