--- alx-src/branches/alxconf-060/Makefile	2011/05/07 11:11:50	1980
+++ alx-src/branches/alxconf-060/Makefile	2011/06/27 15:05:20	2468
@@ -17,10 +17,9 @@
 	install -d -m 0755 $(DESTDIR)/$(alxconfdir)/skel/fluxbox
 	install -d -m 0755 $(DESTDIR)/$(alxconfdir)/skel/net
 	install -d -m 0755 $(DESTDIR)/$(alxconfdir)/skel/slim
-	install -d -m 0755 $(DESTDIR)/$(alxconfdir)/skel/xtdesktop
 	install -d -m 0755 $(DESTDIR)/$(alxconfdir)/ica-sessions/icons
 	install -d -m 0755 $(DESTDIR)/$(sysconfdir)/rc.d/init.d
-	install -d -m 0755 $(DESTDIR)/$(sysconfdir)/sysconfig/hwsetup
+	install -d -m 0755 $(DESTDIR)/$(sysconfdir)/conf.d/hwsetup
 	install -d -m 0755 $(DESTDIR)/$(libdir)/functions
 	install -d -m 0755 $(DESTDIR)/$(libdir)/bin
 	install -d -m 0755 $(DESTDIR)/$(sbindir)
@@ -46,13 +45,14 @@
 	install -m 0644 functions/config_auth.sh $(DESTDIR)$(libdir)/functions/config_auth
 	install -m 0644 functions/config_ssh_auth.sh $(DESTDIR)$(libdir)/functions/config_ssh_auth
 	install -m 0644 functions/config_modules.sh $(DESTDIR)$(libdir)/functions/config_modules
-	install -m 0644 config_versions.sh $(DESTDIR)$(libdir)/functions/config_modules
+	install -m 0644 functions/config_versions.sh $(DESTDIR)$(libdir)/functions/config_versions
 	install -m 0644 functions/mysqlfunctions $(DESTDIR)$(libdir)/functions/mysqlfunctions
 	install -m 0644 functions/serial_functions.sh $(DESTDIR)$(libdir)/functions/serial_functions
+	install -m 0644 functions/common.sh $(DESTDIR)$(libdir)/functions/common
 
 	# configs
 	install -m 0644 conf/config.rc $(DESTDIR)$(alxconfdir)
-	install -m 0644 conf/unsupported-netcard-drivers $(DESTDIR)$(sysconfdir)/sysconfig/hwsetup || die
+	install -m 0644 conf/unsupported-netcard-drivers $(DESTDIR)$(sysconfdir)/conf.d/hwsetup || die
 
 	# icons
 	install -m 0644 icons/default.png $(DESTDIR)$(alxconfdir)/ica-sessions/icons/
@@ -62,10 +62,8 @@
 	# skeletons
 	install -m 0644 skel/fluxbox/* $(DESTDIR)$(alxconfdir)/skel/fluxbox/
 	install -m 0644 skel/net/* $(DESTDIR)$(alxconfdir)/skel/net/
-	install -m 0644 skel/xtdesktop/* $(DESTDIR)$(alxconfdir)/skel/xtdesktop/
 	install -m 0644 skel/slim/* $(DESTDIR)$(alxconfdir)/skel/slim/
 
-install: create-dirs \
-	install-files \
+install: create-dirs install-files
 
 .PHONY: all install