Also support .CURDIR for BSD make compatibility

diff --git a/Makefile.unix b/Makefile.unix
index 988ee8ad0ef38ed94e38b658bafcd3b57f04923a..9c4310bb50ad1b9c4cab2010da9dee770c3e4f27 100644 (file)
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -22,5 +22,6 @@ xmake: $(CSRC)
 endif
 
 clean:
+
        if [ -f xmake ]; then rm -rf xmake; fi
        if [ -f xmake.exe ]; then rm -rf xmake.exe; fi

diff --git a/Makefile.w32 b/Makefile.w32
index 7b97bd47d92aa7801104fbd8d6e654cab482650b..7d64d9ec93a7b50358b5fe4e21dd153720789177 100644 (file)
--- a/Makefile.w32
+++ b/Makefile.w32
@@ -12,8 +12,10 @@ CSRC                :=  cstr.c hashtab.c lib.c read.c report.c rule.c variable.c
 all: xmake.exe
 
 xmake.exe: $(CSRC)
+
        $(CC) $(CFLAGS) -o $@ $^
 
 clean:
+
        if exist xmake ( del /q xmake )
        if exist xmake.exe ( del /q xmake.exe )

diff --git a/xmake.c b/xmake.c
index 01ede502d0b8d3e368fe4ba8c07e186e465c2abf..b16032d39d65e2b1469823a01f86a1ee44f0edf5 100644 (file)
--- a/xmake.c
+++ b/xmake.c
@@ -553,14 +553,22 @@ int main (int argc, char **argv) {
     
     {
     
-        char *name = "CURDIR", *cwd, *path;
+        char *cwd, *path;
         size_t len;
         
         cwd = get_current_directory ();
-        len = strlen (name) + 4 + strlen (cwd);
+        len = strlen ("CURDIR") + 4 + strlen (cwd);
         
         path = xmalloc (len + 1);
-        sprintf (path, "%s ?= %s", name, cwd);
+        sprintf (path, "CURDIR ?= %s", cwd);
+        
+        parse_var_line (path, VAR_ORIGIN_FILE);
+        free (path);
+        
+        len = strlen (".CURDIR") + 4 + strlen (cwd);
+        
+        path = xmalloc (len + 1);
+        sprintf (path, ".CURDIR ?= %s", cwd);
         
         parse_var_line (path, VAR_ORIGIN_FILE);
         free (path);