diff --git a/Makefile b/Makefile
index 8fcf12e3588dcb21f05ad23c6af86019931a1c48..b5c2b13d047caee50306cd4b956db1f13ae14940 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,6 @@
 #
 
 include sysconfig.mk
-NCHOME = .
-NCSRC = .
 #
 # When changing VERSION modify README, sysconfig.h !
 #
@@ -87,8 +85,9 @@ shared: libobjects
 	rm -f $(NCHOME)/lib/$(NCLIBSHSYMLINK)
 	mkdir -p $(NCHOME)/lib
 	$(LD) $(LDFLAGS) -o $(NCHOME)/lib/$(NCLIBSH) $(LIBOBJS)
-	ln -sf  $(NCHOME)/lib/$(NCLIBSH) $(NCHOME)/lib/$(SHSONAME)
-	ln -sf  $(NCHOME)/lib/$(SHSONAME) $(NCHOME)/lib/$(NCLIBSHSYMLINK)
+	cd $(NCHOME)/lib
+	ln -s $(NCLIBSH) $(SHSONAME)
+	ln -s $(SHSONAME) $(NCLIBSHSYMLINK)
 
 
 
diff --git a/compiler/nc/Makefile b/compiler/nc/Makefile
index 5005940ce21f791f3fff08014baa3125356ee36e..c77d6acc1d135697f5e3c10c3a2eabe7d6ac83b2 100644
--- a/compiler/nc/Makefile
+++ b/compiler/nc/Makefile
@@ -9,7 +9,9 @@
 #               nc installed directly in $(NCHOME)/bin
 
 include ../../sysconfig.mk
-VPATH=          $(NCSRC)/compiler/nc
+# VPATH=          $(NCSRC)/compiler/nc
+NCSRC = ../..
+NCHOME = ../..
 
 OBJS =          main.o argtab.o getargs.o stoi.o
 SRC =           main.c argtab.c getargs.c stoi.c
diff --git a/include/sysconfig.h b/include/sysconfig.h
old mode 100755
new mode 100644
diff --git a/sysconfig.mk b/sysconfig.mk
index dc2c2ca306efd15b208f7acfd18bb2215d68d88e..fedafd6a19144ad4a86c60a7330cda0a1a72cb0b 100644
--- a/sysconfig.mk
+++ b/sysconfig.mk
@@ -5,6 +5,9 @@ LIBSUBRELEASE = 1
 INST_DIR_LIB = /runtime
 INST_DIR_BIN = /runtime
 
+NCHOME = ${PWD}
+NCSRC = ${PWD}
+
 FLEXLIB = -ll
 MATHLIB = -lm