more corrections 8^I

Makefile

@@ -65,13 +65,13 @@ install:
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN} $(DESTDIR)$(PREFIX)/bin
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/manjaro-architect
+	install -dm0755 $(DESTDIR)$(PREFIX)$(LIBDIR)
 	install -m0644 ${LIBS} $(DESTDIR)$(PREFIX)$(LIBDIR)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-architect
+	install -dm0755 $(DESTDIR)$(PREFIX)$(DATADIR)/package-lists
 	install -m0644 ${LISTS} $(DESTDIR)$(PREFIX)$(DATADIR)/package-lists
 	
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools
+	install -dm0755 $(DESTDIR)$(PREFIX)$(DATADIR)/translations
 	install -m0644 ${LANG} $(DESTDIR)$(PREFIX)$(DATADIR)/translations
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps

bin/manjaro-architect.in

@@ -14,12 +14,12 @@ version=@version@
 
 LIBDIR='@libdir@'
 DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
 
-import ${LIBDIR}/util.sh
+[[ -r ${LIBDIR}/util.sh ]] && source ${LIBDIR}/util.sh
+
 import ${LIBDIR}/util-menu.sh
 import ${LIBDIR}/util-base.sh
-import $[LIBDIR}/util-desktop.sh
+import ${LIBDIR}/util-desktop.sh
 import ${LIBDIR}/util-disk.sh
 
 id_system

lib/util.sh

@@ -72,6 +72,13 @@ VB_MOD=""        # headers packages to install depending on kernel(s)
 SHOW_ONCE=0      # Show de_wm information only once
 COPY_PACCONF=0   # Copy over installer /etc/pacman.conf to installed system?
 
+import(){
+    if [[ -r $1 ]];then
+        source $1
+    else
+        die "Could not import $1"
+    fi
+}
 
 DIALOG() {
     dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --column-separator "|" --title "$@"