wineprefixcreate and related files need to be installed when doing an

install-lib.
This commit is contained in:
Alexandre Julliard 2005-03-02 12:18:55 +00:00
parent 36e845ce05
commit beac194092
2 changed files with 10 additions and 7 deletions

View File

@ -49,10 +49,10 @@ INSTALLLIBSUBDIRS = \
server server
# Sub-directories to install for install-dev # Sub-directories to install for install-dev
INSTALLDEVSUBDIRS = include tools INSTALLDEVSUBDIRS = include
# Sub-directories to install for both install-lib and install-dev # Sub-directories to install for both install-lib and install-dev
INSTALLBOTHSUBDIRS = dlls libs INSTALLBOTHSUBDIRS = dlls libs tools
INSTALLSUBDIRS = $(INSTALLDEVSUBDIRS) $(INSTALLLIBSUBDIRS) INSTALLSUBDIRS = $(INSTALLDEVSUBDIRS) $(INSTALLLIBSUBDIRS)
@ -119,7 +119,7 @@ include/__install__: include libs tools
libs/__install-lib__ libs/__install-dev__: libs libs/__install-lib__ libs/__install-dev__: libs
fonts/__install__ loader/__install__ server/__install__: libs tools fonts/__install__ loader/__install__ server/__install__: libs tools
programs/__install__: libs tools include dlls/__install-lib__ programs/__install__: libs tools include dlls/__install-lib__
tools/__install__: tools tools/__install-lib__ tools/__install-dev__: tools
$(SUBDIRS:%=%/__depend__): tools include $(SUBDIRS:%=%/__depend__): tools include

View File

@ -59,15 +59,18 @@ wineprefixcreate: wineprefixcreate.in
sed -e 's,@dlldir\@,$(dlldir),g' -e 's,@datadir\@,$(datadir),g' $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false) sed -e 's,@dlldir\@,$(dlldir),g' -e 's,@datadir\@,$(datadir),g' $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false)
chmod +x wineprefixcreate chmod +x wineprefixcreate
install:: wineprefixcreate install install-lib:: wineprefixcreate
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) $(datadir)/wine $(datadir)/applications $(MKINSTALLDIRS) $(bindir) $(datadir)/wine $(datadir)/applications
$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker
$(INSTALL_SCRIPT) wineprefixcreate $(bindir)/wineprefixcreate $(INSTALL_SCRIPT) wineprefixcreate $(bindir)/wineprefixcreate
$(INSTALL_DATA) $(SRCDIR)/winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
$(INSTALL_DATA) $(SRCDIR)/wine.inf $(datadir)/wine/wine.inf $(INSTALL_DATA) $(SRCDIR)/wine.inf $(datadir)/wine/wine.inf
$(INSTALL_DATA) $(SRCDIR)/wine.desktop $(datadir)/applications/wine.desktop $(INSTALL_DATA) $(SRCDIR)/wine.desktop $(datadir)/applications/wine.desktop
-$(UPDATE_DESKTOP_DATABASE) -$(UPDATE_DESKTOP_DATABASE)
install install-dev:: $(INSTALLSUBDIRS:%=%/__install__)
$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext)
$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker
$(INSTALL_DATA) $(SRCDIR)/winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
uninstall:: uninstall::
$(RM) $(bindir)/winemaker $(bindir)/wineprefixcreate $(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \ $(RM) $(bindir)/winemaker $(bindir)/wineprefixcreate $(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \
$(datadir)/wine/wine.inf $(datadir)/applications/wine.desktop $(datadir)/wine/wine.inf $(datadir)/applications/wine.desktop