make install cleanup
diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb
index 2f32d94..182e41f 100644
--- a/win32/Makefile.bcb
+++ b/win32/Makefile.bcb
@@ -244,7 +244,7 @@
rebuild : clean all
-install : all
+install-libs : all
if not exist "$(INCPREFIX)\libxml" mkdir "$(INCPREFIX)\libxml"
if not exist "$(BINPREFIX)" mkdir "$(BINPREFIX)"
if not exist "$(LIBPREFIX)" mkdir "$(LIBPREFIX)"
@@ -254,14 +254,10 @@
copy $(BINDIR)\$(XML_IMP) "$(LIBPREFIX)"
copy $(BINDIR)\*.exe "$(BINPREFIX)"
-install-bindist : all
- if not exist "$(INCPREFIX)\libxml" mkdir "$(INCPREFIX)\libxml"
- if not exist "$(BINPREFIX)" mkdir "$(BINPREFIX)"
- if not exist "$(LIBPREFIX)" mkdir "$(LIBPREFIX)"
- copy $(XML_SRCDIR)\include\libxml\*.h "$(INCPREFIX)\libxml"
- copy $(BINDIR)\$(XML_SO) "$(SOPREFIX)"
- copy $(BINDIR)\$(XML_A) "$(LIBPREFIX)"
- copy $(BINDIR)\$(XML_IMP) "$(LIBPREFIX)"
+install : install-libs
+ copy $(BINDIR)\*.exe "$(BINPREFIX)"
+
+install-dist : install-libs
copy $(BINDIR)\xml*.exe "$(BINPREFIX)"
# This is a target for me, to make a binary distribution. Not for the public use,
@@ -269,7 +265,7 @@
BDVERSION = $(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION).$(LIBXML_MICRO_VERSION)
BDPREFIX = $(XML_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 $(XML_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt
diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw
index 8de1ae9..0a4f314 100644
--- a/win32/Makefile.mingw
+++ b/win32/Makefile.mingw
@@ -243,17 +243,7 @@
rebuild : clean all
-install : all
- cmd.exe /C if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml
- cmd.exe /C if not exist $(BINPREFIX) mkdir $(BINPREFIX)
- cmd.exe /C if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
- cmd.exe /C copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml
- cmd.exe /C copy $(BINDIR)\$(XML_SO) $(SOPREFIX)
- cmd.exe /C copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
- cmd.exe /C copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
- cmd.exe /C copy $(BINDIR)\*.exe $(BINPREFIX)
-
-install-bindist : all
+install-libs : all
cmd.exe /C if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml
cmd.exe /C if not exist $(BINPREFIX) mkdir $(BINPREFIX)
cmd.exe /C if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
@@ -263,12 +253,18 @@
cmd.exe /C copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
cmd.exe /C copy $(BINDIR)\xml*.exe $(BINPREFIX)
+install : install-libs
+ cmd.exe /C copy $(BINDIR)\*.exe $(BINPREFIX)
+
+install-dist : install-libs
+ cmd.exe /C copy $(BINDIR)\xml*.exe $(BINPREFIX)
+
# This is a target for me, to make a binary distribution. Not for the public use,
# keep your hands off :-)
BDVERSION = $(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION).$(LIBXML_MICRO_VERSION)
BDPREFIX = $(XML_BASENAME)-$(BDVERSION).win32
bindist : all
- $(MAKE) PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)/bin install-bindist
+ $(MAKE) PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)/bin install-dist
cscript //NoLogo configure.js genreadme $(XML_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index be10cf9..f57b53c 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -220,7 +220,7 @@
rebuild : clean all
-install : all
+install-libs : all
if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml
if not exist $(BINPREFIX) mkdir $(BINPREFIX)
if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
@@ -229,26 +229,21 @@
copy $(BINDIR)\$(XML_SO) $(SOPREFIX)
copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
+
+install : install-libs
copy $(BINDIR)\*.exe $(BINPREFIX)
-copy $(BINDIR)\*.pdb $(BINPREFIX)
-install-bindist : all
- if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml
- if not exist $(BINPREFIX) mkdir $(BINPREFIX)
- if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
- if not exist $(SOPREFIX) mkdir $(SOPREFIX)
- copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml
- copy $(BINDIR)\$(XML_SO) $(SOPREFIX)
- copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
- copy $(BINDIR)\$(XML_IMP) $(LIBPREFIX)
+install-dist : install-libs
copy $(BINDIR)\xml*.exe $(BINPREFIX)
+ -copy $(BINDIR)\xml*.pdb $(BINPREFIX)
# This is a target for me, to make a binary distribution. Not for the public use,
# keep your hands off :-)
BDVERSION = $(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION).$(LIBXML_MICRO_VERSION)
BDPREFIX = $(XML_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 $(XML_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt