Browse Source

* change \ to / for pwd, since the win32 pwd returns paths with \

peter 24 years ago
parent
commit
5e998e22a2
8 changed files with 175 additions and 165 deletions
  1. 2 2
      compiler/Makefile
  2. 2 2
      compiler/utils/Makefile
  3. 2 2
      rtl/Makefile
  4. 2 2
      rtl/go32v2/Makefile
  5. 2 2
      rtl/win32/Makefile
  6. 12 3
      tests/webtbs/tw1501.pp
  7. 152 151
      utils/fpcm/fpcmake.inc
  8. 1 1
      utils/fpcm/fpcmake.ini

+ 2 - 2
compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/28]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif

+ 2 - 2
compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/28]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif

+ 2 - 2
rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/28]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif

+ 2 - 2
rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/28]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif

+ 2 - 2
rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/03]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/28]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -53,7 +53,7 @@ else
 PATHSEP:=$(subst /,\,/)
 endif
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif

+ 12 - 3
tests/webtbs/tw1501.pp

@@ -12,7 +12,16 @@ begin
 end;
 
 begin
-        writeln('test', Uper1('test'));
-        writeln('test', Uper2('test'));
-
+  writeln('test', Uper1('test'));
+  writeln('test', Uper2('test'));
+  if Uper1('test')<>'TEST' then
+   begin
+     writeln('ERROR in Uper1!');
+     halt(1);
+   end;
+  if Uper2('test')<>'TEST' then
+   begin
+     writeln('ERROR in Uper2!');
+     halt(1);
+   end;
 end.

File diff suppressed because it is too large
+ 152 - 151
utils/fpcm/fpcmake.inc


+ 1 - 1
utils/fpcm/fpcmake.ini

@@ -79,7 +79,7 @@ endif
 
 # Base dir
 ifdef PWD
-BASEDIR:=$(shell $(PWD))
+BASEDIR:=$(subst \,/,$(shell $(PWD)))
 else
 BASEDIR=.
 endif

Some files were not shown because too many files changed in this diff