Tried to fix makefile.g95

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index bb77996c012f9a1267703d662167d62dedc2afe9..babf16de192fb7091ed24bd9252f4e7733cb94bd 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -118,7 +118,6 @@ src/regex/makefile*
 src/regex/README
 src/regex/WHATSNEW
 src/regex/mkh
 src/regex/README
 src/regex/WHATSNEW
 src/regex/mkh

-src/regex/makefile*

 src/regex/*.h
 src/regex/*.ih
 src/regex/*.c
 src/regex/*.h
 src/regex/*.ih
 src/regex/*.c

diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t
index b3ba730fc617cf04a0a65f224ae2bc5bfc70a8a2..15b3cb19301a5b2380c89f929a9d3e61519d5a6b 100644 (file)
--- a/distrib/msw/tmake/g95.t
+++ b/distrib/msw/tmake/g95.t
@@ -298,7 +298,8 @@ else
   PATH_SUBST:=$(BACKSLASH)
 endif
 
   PATH_SUBST:=$(BACKSLASH)
 endif
 

-ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
+#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
+ARCHINCDIR=(WXDIR)/lib/msw$(INCEXT)

 
 SETUP_H=$(ARCHINCDIR)/wx/setup.h
 
 
 SETUP_H=$(ARCHINCDIR)/wx/setup.h
 


@@ -313,7 +314,9 @@ $(ARCHINCDIR)/wx:
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
 $(SETUP_H): $(ARCHINCDIR)/wx
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
 $(SETUP_H): $(ARCHINCDIR)/wx

-       $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
+       $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
+
+#      $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)

 
 ifndef WXMAKINGDLL
 
 
 ifndef WXMAKINGDLL
 

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index d5f4db1b88cb1f078f367881bd0395a97e04bdfc..32a65a499b615bea841d61fda9df4ee452223741 100755 (executable)
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -85,7 +85,7 @@ zip32 -@ %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\msw.rsp
 zip32 -@ -u %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\makefile.rsp
 zip32 -@ %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\gtk.rsp
 zip32 -@ -u %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\makefile.rsp
 zip32 -@ -u %dest\wxWindows-%version%-msw.zip < %src\distrib\msw\makefile.rsp
 zip32 -@ %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\gtk.rsp
 zip32 -@ -u %dest\wxWindows-%version%-gtk.zip < %src\distrib\msw\makefile.rsp

-zip32 -@ %dest\wxWindows-%version%-stubs.zip < %src\distrib\msw\stubs.rsp
+Rem zip32 -@ %dest\wxWindows-%version%-stubs.zip < %src\distrib\msw\stubs.rsp

 zip32 -@ %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\motif.rsp
 zip32 -@ -u %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\makefile.rsp
 Rem (Obsolete) zip32 -@ %dest\wxWindows-%version%-user.zip < %src\distrib\msw\user.rsp
 zip32 -@ %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\motif.rsp
 zip32 -@ -u %dest\wxWindows-%version%-mot.zip < %src\distrib\msw\makefile.rsp
 Rem (Obsolete) zip32 -@ %dest\wxWindows-%version%-user.zip < %src\distrib\msw\user.rsp

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 5fe109c698a72bd909b6dc521134895c2f0cf5e2..7a30787bbdb4c91aa5b000d9693d7992078b1b3e 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -501,7 +501,8 @@ else
   PATH_SUBST:=$(BACKSLASH)
 endif
 
   PATH_SUBST:=$(BACKSLASH)
 endif
 

-ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
+#ARCHINCDIR=$(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/lib/msw$(INCEXT))
+ARCHINCDIR=$(WXDIR)/lib/msw$(INCEXT)

 
 SETUP_H=$(ARCHINCDIR)/wx/setup.h
 
 
 SETUP_H=$(ARCHINCDIR)/wx/setup.h
 


@@ -516,7 +517,9 @@ $(ARCHINCDIR)/wx:
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
 $(SETUP_H): $(ARCHINCDIR)/wx
        mkdir $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(ARCHINCDIR)/wx)
 
 $(SETUP_H): $(ARCHINCDIR)/wx

-       $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)
+       $(COPY) $(WXDIR)/include/wx/msw/setup.h $@
+
+#      $(COPY) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$(WXDIR)/include/wx/msw/setup.h) $(subst $(PATH_SUBST),$(PATH_SEPARATOR),$@)

 
 ifndef WXMAKINGDLL
 
 
 ifndef WXMAKINGDLL