diff --git a/scripts/install_irpf90.sh b/scripts/install_irpf90.sh index de03e72b..04513ca8 100755 --- a/scripts/install_irpf90.sh +++ b/scripts/install_irpf90.sh @@ -22,8 +22,8 @@ tar -zxf ${BASE}.tar.gz && rm ${BASE}.tar.gz ||exit 1 mv ${BASE}-master irpf90 make -C irpf90 | tee install_irpf90.log rm -rf -- bin/irpf90 bin/irpman -echo ${PWD}/irpf90/bin/irpf90 $@ > bin/irpf90 -echo ${PWD}/irpf90/bin/irpman $@ > bin/irpman +echo '${QPACKAGE_ROOT}/irpf90/bin/irpf90 $@' > bin/irpf90 +echo '${QPACKAGE_ROOT}/irpf90/bin/irpman $@' > bin/irpman chmod +x bin/irpf90 bin/irpman diff --git a/src/Makefile.common b/src/Makefile.common index 7574b3dd..a2fbeb31 100644 --- a/src/Makefile.common +++ b/src/Makefile.common @@ -15,6 +15,8 @@ $(info -------------------- Error --------------------) $(info QPACKAGE_ROOT undefined. Run the setup_environment.sh script) $(info -----------------------------------------------) $(error ) +else +$(info QPACKAGE_ROOT is defined.) endif @@ -28,6 +30,8 @@ $(info You can create Makefile.config) $(info by modifying Makefile.config.example) $(info -----------------------------------------------) $(error ) +else +$(info Makefile.config is present.) endif @@ -46,6 +50,8 @@ $(info To upgrade IRPF90, run : ) $(info $(QPACKAGE_ROOT)/scripts/upgrade_irpf90.sh ) $(info -----------------------------------------------) $(error ) +else +$(info irpf90 version is OK.) endif @@ -63,6 +69,8 @@ $(info Your NEEDED_MODULES file is inconsistent. It should be) $(info $(NEEDED_MODULES_OK)) $(info -----------------------------------------------) $(error ) +else +$(info NEEDED_MODULES files is consistent.) endif @@ -83,6 +91,8 @@ $(info You should document it before you compile, as) $(info well as the ASSUMPTIONS.rst file.) $(info -----------------------------------------------) $(error ) +else +$(info README.rst is present.) endif @@ -94,6 +104,8 @@ $(info -------------------- Error --------------------) $(info This is a Bug. At that point, the ASSUMPTIONS.rst) $(info file should exist.) $(info -----------------------------------------------) +else +$(info ASSUMPTIONS.rst is present.) endif @@ -113,6 +125,8 @@ $(info To upgrade EZFIO, run : ) $(info $(QPACKAGE_ROOT)/scripts/upgrade_ezfio.sh ) $(info -----------------------------------------------) $(error ) +else +$(info EZFIO version is OK.) endif # Define the EZFIO rules