updated smeka to latest version

Signed-off-by: Nick Papior <[email protected]>
ElectronicStructureLibrary · Mar 21, 2023 · 20495df · 20495df
1 parent 4ad9c49
commit 20495df
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 20 deletions.
diff --git a/smeka/Makefile.common b/smeka/Makefile.common
@@ -12,8 +12,12 @@ addpresuf = $(addsuffix $(2),$(addprefix $(1),$(3)))
 # require changes etc.
 
 # Define common variables
+_OCT_xxx = 111
+_OCT_www = 222
 _OCT_rrr = 444
 _OCT_rwrr = 644
+_OCT_rwrwrw = 666
+_OCT_rwrxrx = 655
 _OCT_rwxrxrx = 755
 _OCT_rxrxrx = 555
 

diff --git a/smeka/Makefile.default b/smeka/Makefile.default
@@ -6,6 +6,10 @@ SETUP = setup.make
 endif
 endif
 
+# Default fypp commands
+FYPP = fypp
+FYPPFLAGS =
+
 
 # Specific options for different OS
 ifeq ($(SMEKA_uname_S),Linux)

diff --git a/smeka/Makefile.directory b/smeka/Makefile.directory
@@ -25,36 +25,36 @@ endif
 endif
 
 # Include directory (.h)
-INC_DIR ?= $(PREFIX)/include
+INC_DIR ?= include
 # Module directory (.mod)
 FMOD_DIR ?= $(INC_DIR)
 # Executables
-BIN_DIR ?= $(PREFIX)/bin
+BIN_DIR ?= bin
 # Library directory (.a/.so)
-LIB_DIR ?= $(PREFIX)/lib
+LIB_DIR ?= lib
 # shared folder
-SHARE_DIR ?= $(PREFIX)/share
+SHARE_DIR ?= share
 # Manual folder (man ***)
 MAN_DIR ?= $(SHARE_DIR)/man
 # pkg-config files
 PKG_DIR ?= $(LIB_DIR)/pkgconfig
 # additional files (settings etc.)
-ETC_DIR ?= $(PREFIX)/etc
+ETC_DIR ?= etc
 
 
 # Print out settings from this file
 .PHONY: smeka-settings-dir
 smeka-settings-dir:
 	@$(ECHO) "Directory settings:"
 	@$(ECHO) "Prefix            (PREFIX) : $(PREFIX)"
-	@$(ECHO) "Includes         (INC_DIR) : $(INC_DIR)"
-	@$(ECHO) "Fortran modules (FMOD_DIR) : $(FMOD_DIR)"
-	@$(ECHO) "Binaries         (BIN_DIR) : $(BIN_DIR)"
-	@$(ECHO) "Libraries        (LIB_DIR) : $(LIB_DIR)"
-	@$(ECHO) "Shared         (SHARE_DIR) : $(SHARE_DIR)"
-	@$(ECHO) "Man              (MAN_DIR) : $(MAN_DIR)"
-	@$(ECHO) "pkg-config       (PKG_DIR) : $(PKG_DIR)"
-	@$(ECHO) "etc.             (ETC_DIR) : $(ETC_DIR)"
+	@$(ECHO) "Includes         (INC_DIR) : $(PREFIX)/$(INC_DIR)"
+	@$(ECHO) "Fortran modules (FMOD_DIR) : $(PREFIX)/$(FMOD_DIR)"
+	@$(ECHO) "Binaries         (BIN_DIR) : $(PREFIX)/$(BIN_DIR)"
+	@$(ECHO) "Libraries        (LIB_DIR) : $(PREFIX)/$(LIB_DIR)"
+	@$(ECHO) "Shared         (SHARE_DIR) : $(PREFIX)/$(SHARE_DIR)"
+	@$(ECHO) "Man              (MAN_DIR) : $(PREFIX)/$(MAN_DIR)"
+	@$(ECHO) "pkg-config       (PKG_DIR) : $(PREFIX)/$(PKG_DIR)"
+	@$(ECHO) "etc.             (ETC_DIR) : $(PREFIX)/$(ETC_DIR)"
 settings: smeka-settings-dir
 
 # Local Variables:

diff --git a/smeka/Makefile.install b/smeka/Makefile.install
@@ -21,16 +21,16 @@ smeka-install-lib: smeka-install-init-dir
 # Note that the x flag is common practice for libraries
 # although it may surprise first-time users.
 ifneq ($(LIBRARIES),)
-	$(INSTALL) -m $(_OCT_rwxrxrx) -t $(DESTDIR)$(LIB_DIR) $(LIBRARIES)
+	$(INSTALL) -m $(_OCT_rwxrxrx) -t $(DESTDIR)$(PREFIX)/$(LIB_DIR) $(LIBRARIES)
 endif
 
 
 .PHONY: smeka-install-init-dir
 .NOTPARALLEL: smeka-install-init-dir
 smeka-install-init-dir:
-	-$(MKDIR) $(MKDIR_FLAG_PARENT) $(DESTDIR)$(INC_DIR)
-	-$(MKDIR) $(MKDIR_FLAG_PARENT) $(DESTDIR)$(LIB_DIR)
-	-$(MKDIR) $(MKDIR_FLAG_PARENT) $(DESTDIR)$(BIN_DIR)
+	-$(MKDIR) $(MKDIR_FLAG_PARENT) $(DESTDIR)$(PREFIX)/$(INC_DIR)
+	-$(MKDIR) $(MKDIR_FLAG_PARENT) $(DESTDIR)$(PREFIX)/$(LIB_DIR)
+	-$(MKDIR) $(MKDIR_FLAG_PARENT) $(DESTDIR)$(PREFIX)/$(BIN_DIR)
 
 
 # Issuing uninstall will forcefully remove the installation directory

diff --git a/smeka/Makefile.pkgconfig b/smeka/Makefile.pkgconfig
@@ -22,18 +22,22 @@ endif
 .PHONY: smeka-pkgconfig-init-dir
 .NOTPARALLEL: smeka-pkgconfig-init-dir
 smeka-pkgconfig-init-dir: smeka-install-init-dir
-	-$(MKDIR) $(MKDIR_FLAG_PARENT) $(DESTDIR)$(PKG_DIR)
+	-$(MKDIR) $(MKDIR_FLAG_PARENT) $(DESTDIR)$(PREFIX)/$(PKG_DIR)
 
 .PHONY: smeka-pkgconfig
 .NOTPARALLEL: smeka-pkgconfig
 smeka-pkgconfig: smeka-pkgconfig-init-dir
 	$(SED) "s:@PREFIX@:$(PREFIX):g;\
+		s:@CMAKE_INSTALL_PREFIX@:$(PREFIX):g;\
 		s:@PROJECT_NAME@:$(PROJECT_NAME):g;\
 		s:@PROJECT_VERSION@:$(PROJECT_VERSION):g;\
 		s:@INC_DIR@:$(INC_DIR):g;\
+		s:@CMAKE_INSTALL_INCLUDEDIR@:$(INC_DIR):g;\
 		s:@LIB_DIR@:$(LIB_DIR):g;\
-		s:@BIN_DIR@:$(BIN_DIR):g" \
-		$(_SMEKA_INSTALL_PKG_CONFIG_FILE) > $(DESTDIR)$(PKG_DIR)/$(PROJECT_NAME).pc
+		s:@CMAKE_INSTALL_LIBDIR@:$(LIB_DIR):g;\
+		s:@BIN_DIR@:$(BIN_DIR):g;\
+		s:@CMAKE_INSTALL_BINDIR@:$(BIN_DIR):g" \
+		$(_SMEKA_INSTALL_PKG_CONFIG_FILE) > $(DESTDIR)$(PREFIX)/$(PKG_DIR)/$(PROJECT_NAME).pc
 
 ifeq ($(_SMEKA_INSTALL_PKG_CONFIG),1)
 smeka-install: smeka-pkgconfig