diff --git a/.gitignore b/.gitignore
index e93e529..cfd51a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,9 @@ share/hdf5-1.8.14.tar.bz2
 share/v3.2.1.tar.gz
 src/deplist.mk
 src/srcfiles_pp.mk
+bin/h5diff
+bin/hopr
+bin/preproctool
+src/libpreproc.a
+*.mod
+*.o
diff --git a/Makefile b/Makefile
index cc216fb..bf63d86 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ clean:
 veryclean:
 	cd src   && $(MAKE) veryclean
 	cd tools/yplusestimator && $(MAKE) veryclean
-	rm -f lib/$(PREPROC_LIB)
+	rm -f src/$(PREPROC_LIB)
 	rm -f *~ */*~ */*/*~
 
 cleanshare:
diff --git a/share/Makefile b/share/Makefile
index 948963a..904556d 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -38,7 +38,8 @@ cgns: dir
 		if [ ! -d $(SHARECOMP)/CGNS-$(CGNS_VERSION) ] ; then \
 			cd $(SHARECOMP) && tar -xvzf ../v$(CGNS_VERSION).tar.gz 1>/dev/null && cd .. ; \
 		fi ; \
-    sed -i 's/^c/!/g' $(CGNS_DIR)/src/cgnslib_f.h ;\
+		echo $(CGNS_DIR)/src/cgnslib_f.h.in ; \
+    sed -i s/^c/!/g $(CGNS_DIR)/cgnslib_f.h.in ;\
  		cd $(CGNS_DIR) && FC='$(FC)' ./configure --enable-lfs  $(CGNSF2C) && $(MAKE) ; \
 		echo "===============================================================";\
 		echo "= C G N S   D O N E                                           =";\
diff --git a/src/Makefile b/src/Makefile
index a6288b8..da4abf6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,7 +17,7 @@ all: builddeps
 	@echo '~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~'
 	@echo ' HOPR COMPILED, NOW LINKING...'
 	@echo '----------------------------------------------------------------------------------------'
-	$(FC) $(FLFLAGS) hopr.o ../lib/$(PREPROC_LIB) -o ../bin/hopr \
+	$(FC) $(FLFLAGS) hopr.o $(PREPROC_LIB) -o ../bin/hopr \
 	$(LIBDIRS) \
 	$(EXTERNAL_LIBS)
 	cp ../bin/hopr ../bin/preproctool
@@ -33,7 +33,7 @@ builddeps:
 	@python ../tools/builddeps/builddeps --source=srcfiles_pp.mk deplist.mk
 
 $(PREPROC_LIB): $(OBJ)
-	$(AR) $(AR_FLAGS) ../lib/$(PREPROC_LIB) $(OBJ)
+	$(AR) $(AR_FLAGS) $(PREPROC_LIB) $(OBJ)
 
 %.o: %.c
 	$(CC) -c $< -o $@