From 5879878436bef56218bbdf67f86610dbd111ffa6 Mon Sep 17 00:00:00 2001 From: Igor Zlatkovic Date: Wed, 6 Apr 2005 22:01:57 +0000 Subject: [PATCH] make install cleanup --- win32/Makefile.mingw | 8 ++++++-- win32/Makefile.msvc | 21 +++++---------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw index 4d4fde0..0b2249d 100644 --- a/win32/Makefile.mingw +++ b/win32/Makefile.mingw @@ -166,7 +166,7 @@ distclean : clean cmd.exe /C if exist depends.* del depends.* cmd.exe /C if exist Makefile del Makefile -install : all +install-libs : all cmd.exe /C if not exist $(INCPREFIX)\$(XSLT_BASENAME) mkdir $(INCPREFIX)\$(XSLT_BASENAME) cmd.exe /C if not exist $(INCPREFIX)\$(EXSLT_BASENAME) mkdir $(INCPREFIX)\$(EXSLT_BASENAME) cmd.exe /C if not exist $(BINPREFIX) mkdir $(BINPREFIX) @@ -179,14 +179,18 @@ install : all cmd.exe /C copy $(BINDIR)\$(EXSLT_SO) $(SOPREFIX) cmd.exe /C copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX) cmd.exe /C copy $(BINDIR)\$(EXSLT_IMP) $(LIBPREFIX) + +install : install-libs cmd.exe /C copy $(BINDIR)\*.exe $(BINPREFIX) +install-dist : install + # This is a target for me, to make a binary distribution. Not for the public use, # keep your hands off :-) BDVERSION = $(LIBXSLT_MAJOR_VERSION).$(LIBXSLT_MINOR_VERSION).$(LIBXSLT_MICRO_VERSION) BDPREFIX = $(XSLT_BASENAME)-$(BDVERSION).win32 bindist : all - $(MAKE) PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)/bin install + $(MAKE) PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)/bin install-dist cscript //NoLogo configure.js genreadme $(XSLT_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 1ea64f0..16ffbbe 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -167,7 +167,7 @@ distclean : clean if exist config.* del config.* if exist Makefile del Makefile -install : all +install-libs : all if not exist $(INCPREFIX)\$(XSLT_BASENAME) mkdir $(INCPREFIX)\$(XSLT_BASENAME) if not exist $(INCPREFIX)\$(EXSLT_BASENAME) mkdir $(INCPREFIX)\$(EXSLT_BASENAME) if not exist $(BINPREFIX) mkdir $(BINPREFIX) @@ -180,30 +180,19 @@ install : all copy $(BINDIR)\$(EXSLT_SO) $(SOPREFIX) copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX) copy $(BINDIR)\$(EXSLT_IMP) $(LIBPREFIX) + +install : install-libs copy $(BINDIR)\*.exe $(BINPREFIX) -copy $(BINDIR)\*.pdb $(BINPREFIX) -install-bindist : all - if not exist $(INCPREFIX)\$(XSLT_BASENAME) mkdir $(INCPREFIX)\$(XSLT_BASENAME) - if not exist $(INCPREFIX)\$(EXSLT_BASENAME) mkdir $(INCPREFIX)\$(EXSLT_BASENAME) - if not exist $(BINPREFIX) mkdir $(BINPREFIX) - if not exist $(LIBPREFIX) mkdir $(LIBPREFIX) - copy $(XSLT_SRCDIR)\*.h $(INCPREFIX)\$(XSLT_BASENAME) - copy $(EXSLT_SRCDIR)\*.h $(INCPREFIX)\$(EXSLT_BASENAME) - copy $(BINDIR)\$(XSLT_SO) $(SOPREFIX) - copy $(BINDIR)\$(XSLT_A) $(LIBPREFIX) - copy $(BINDIR)\$(XSLT_IMP) $(LIBPREFIX) - copy $(BINDIR)\$(EXSLT_SO) $(SOPREFIX) - copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX) - copy $(BINDIR)\$(EXSLT_IMP) $(LIBPREFIX) - copy $(BINDIR)\*.exe $(BINPREFIX) +install-dist : install # This is a target for me, to make a binary distribution. Not for the public use, # keep your hands off :-) BDVERSION = $(LIBXSLT_MAJOR_VERSION).$(LIBXSLT_MINOR_VERSION).$(LIBXSLT_MICRO_VERSION) BDPREFIX = $(XSLT_BASENAME)-$(BDVERSION).win32 bindist : all - $(MAKE) /nologo PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)\bin install-bindist + $(MAKE) /nologo PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)\bin install-dist cscript //NoLogo configure.js genreadme $(XSLT_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt # Makes the compiler output directory. -- 2.7.4