Fixed installation order of linkable dlls.

This commit is contained in:
Alexandre Julliard 2003-02-19 22:11:37 +00:00
parent 54f377c6c5
commit 76c3065751
2 changed files with 2 additions and 6 deletions

View File

@ -1405,7 +1405,7 @@ kernel: libntdll.dll.$(LIBEXT)
uninstall:: uninstall::
$(RM) $(LINKABLE_DLLS:%=$(libdir)/lib%.$(LIBEXT)) $(RM) $(LINKABLE_DLLS:%=$(libdir)/lib%.$(LIBEXT))
install install-lib:: install install-lib:: $(INSTALLSUBDIRS:%=%/__install__)
$(RM) $(LINKABLE_DLLS:%=$(libdir)/lib%.$(LIBEXT)) $(RM) $(LINKABLE_DLLS:%=$(libdir)/lib%.$(LIBEXT))
cd $(libdir) && if [ "$(dlldir)" = "$(libdir)/wine" ]; \ cd $(libdir) && if [ "$(dlldir)" = "$(libdir)/wine" ]; \
then \ then \
@ -1420,8 +1420,6 @@ install install-dev:: $(IMPORT_LIBS:%=%.$(IMPLIBEXT))
$(MKINSTALLDIRS) $(dlldir) $(MKINSTALLDIRS) $(dlldir)
for f in $(IMPORT_LIBS:%=%.$(IMPLIBEXT)); do $(INSTALL_DATA) $$f $(dlldir)/$$f; done for f in $(IMPORT_LIBS:%=%.$(IMPLIBEXT)); do $(INSTALL_DATA) $$f $(dlldir)/$$f; done
install install-lib:: $(INSTALLSUBDIRS:%=%/__install__)
uninstall:: uninstall::
$(RM) $(IMPORT_LIBS:%=$(dlldir)/%.$(IMPLIBEXT)) $(RM) $(IMPORT_LIBS:%=$(dlldir)/%.$(IMPLIBEXT))
-rmdir $(dlldir) -rmdir $(dlldir)

View File

@ -292,7 +292,7 @@ print NEWMAKE <<EOF;
uninstall:: uninstall::
\$(RM) \$(LINKABLE_DLLS:%=\$(libdir)/lib%.\$(LIBEXT)) \$(RM) \$(LINKABLE_DLLS:%=\$(libdir)/lib%.\$(LIBEXT))
install install-lib:: install install-lib:: \$(INSTALLSUBDIRS:%=%/__install__)
\$(RM) \$(LINKABLE_DLLS:%=\$(libdir)/lib%.\$(LIBEXT)) \$(RM) \$(LINKABLE_DLLS:%=\$(libdir)/lib%.\$(LIBEXT))
cd \$(libdir) && if [ "\$(dlldir)" = "\$(libdir)/wine" ]; \\ cd \$(libdir) && if [ "\$(dlldir)" = "\$(libdir)/wine" ]; \\
then \\ then \\
@ -318,8 +318,6 @@ install install-dev:: \$(IMPORT_LIBS:%=%.\$(IMPLIBEXT))
\$(MKINSTALLDIRS) \$(dlldir) \$(MKINSTALLDIRS) \$(dlldir)
for f in \$(IMPORT_LIBS:%=%.\$(IMPLIBEXT)); do \$(INSTALL_DATA) \$\$f \$(dlldir)/\$\$f; done for f in \$(IMPORT_LIBS:%=%.\$(IMPLIBEXT)); do \$(INSTALL_DATA) \$\$f \$(dlldir)/\$\$f; done
install install-lib:: \$(INSTALLSUBDIRS:%=%/__install__)
uninstall:: uninstall::
\$(RM) \$(IMPORT_LIBS:%=\$(dlldir)/%.\$(IMPLIBEXT)) \$(RM) \$(IMPORT_LIBS:%=\$(dlldir)/%.\$(IMPLIBEXT))
-rmdir \$(dlldir) -rmdir \$(dlldir)