paths fixed for generic directory

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5110 33e552b5-05e3-0310-8538-816dae2090ed

13 files changed, 70 insertions, 55 deletions

diff --git a/rules/Rules.make b/rules/Rules.make
index 0d4b1de62..d1a830d4e 100644
--- a/rules/Rules.make
+++ b/rules/Rules.make
@@ -854,16 +854,16 @@ install_copy = 											\
 			$(INSTALL) -d $(IMAGEDIR)/$$PACKET/ipkg/$$SRC;				\
 			if [ $$? -ne 0 ]; then							\
 				echo "Error: install_copy failed!";				\
-				exit -1;							\
+				exit 1;								\
 			fi;									\
 		fi;										\
 		$(INSTALL) -m $$PER -d $(ROOTDIR)/$$SRC;					\
 		if [ $$? -ne 0 ]; then								\
 			echo "Error: install_copy failed!";					\
-			exit -1;								\
+			exit 1;									\
 		fi;										\
 		mkdir -p $(IMAGEDIR)/$$PACKET;							\
-		echo "f:$$SRC:$$OWN:$$GRP:$$PER" >> $(STATEDIR)/$$PACKET.perms;		\
+		echo "f:$$SRC:$$OWN:$$GRP:$$PER" >> $(STATEDIR)/$$PACKET.perms;			\
 	else											\
 		echo "install_copy:";								\
 		echo "  src=$$SRC";								\
@@ -876,13 +876,13 @@ install_copy = 											\
 			$(INSTALL) -D $$SRC $(IMAGEDIR)/$$PACKET/ipkg/$$DST;			\
 			if [ $$? -ne 0 ]; then							\
 				echo "Error: install_copy failed!";				\
-				exit -1;							\
+				exit 1;								\
 			fi;									\
 		fi; 										\
 		$(INSTALL) -m $$PER -D $$SRC $(ROOTDIR)$$DST;					\
 		if [ $$? -ne 0 ]; then								\
 			echo "Error: install_copy failed!";					\
-			exit -1;								\
+			exit 1;									\
 		fi;										\
 		case "$$STRIP" in								\
 		(0 | n | no)									\
@@ -895,7 +895,7 @@ install_copy = 											\
 			;;									\
 		esac;										\
 		mkdir -p $(IMAGEDIR)/$$PACKET;							\
-		echo "f:$$DST:$$OWN:$$GRP:$$PER" >> $(STATEDIR)/$$PACKET.perms;		\
+		echo "f:$$DST:$$OWN:$$GRP:$$PER" >> $(STATEDIR)/$$PACKET.perms;			\
 	fi
 
 #
diff --git a/rules/Toplevel.make b/rules/Toplevel.make
index 6be137ee3..da0747787 100644
--- a/rules/Toplevel.make
+++ b/rules/Toplevel.make
@@ -54,7 +54,8 @@ ROOTDIR			:= $(PTXDIST_WORKSPACE)/root
 ifeq ($(PTXCONF_SETUP_SRCDIR),)
 SRCDIR			:= $(PTXDIST_WORKSPACE)/src
 else
-SRCDIR			:= $(PTXCONF_SETUP_SRCDIR)
+			# don't use := here!!!
+SRCDIR			= $(call remove_quotes,$(PTXCONF_SETUP_SRCDIR))
 endif
 
 export HOME PTXDIST_WORKSPACE PTXDIST_TOPDIR
diff --git a/rules/apache2.make b/rules/apache2.make
index ce79093d4..b45cd8d67 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -190,7 +190,7 @@ ifneq ($(PTXCONF_APACHE2_DOCUMENTROOT),"")
 	@$(call install_copy, apache2, 12, 102, 0755, $(PTXCONF_APACHE2_DOCUMENTROOT))
 ifdef PTXCONF_APACHE2_DEFAULT_INDEX
 	@$(call install_copy, apache2, 12, 102, 0644, \
-		$(PTXDIST_TOPDIR)/projects/generic/index.html, \
+		$(PTXDIST_TOPDIR)/projects-example/generic/index.html, \
 		$(PTXCONF_APACHE2_DOCUMENTROOT)/index.html,n)
 endif
 endif
@@ -203,7 +203,7 @@ ifneq ($(PTXCONF_APACHE2_CONFIGDIR),"")
 		$(PTXCONF_APACHE2_CONFIGDIR)/magic,n)
 
 ifdef PTXCONF_APACHE2_DEFAULTCONFIG
-	cp $(PTXDIST_TOPDIR)/projects/generic/httpd.conf $(APACHE2_DIR)/httpd.conf
+	cp $(PTXDIST_TOPDIR)/projects-example/generic/httpd.conf $(APACHE2_DIR)/httpd.conf
 
 	# now replace our own options
 	perl -i -p -e "s,\@SERVERROOT@,\"$(PTXCONF_APACHE2_SERVERROOT)\",g" $(APACHE2_DIR)/httpd.conf
@@ -236,7 +236,7 @@ ifdef PTXCONF_ROOTFS_ETC_INITD_HTTPD
 ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_HTTPD_USER_FILE)),)
 	@$(call install_copy, apache2, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_HTTPD_USER_FILE), /etc/init.d/httpd, n)
 else
-	@cp $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/httpd $(APACHE2_DIR)/init_httpd
+	@cp $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/httpd $(APACHE2_DIR)/init_httpd
 	@perl -i -p -e "s,\@APACHECONFIG@,$(call remove_quotes,$(PTXCONF_APACHE2_CONFIGDIR))/httpd.conf,g" $(APACHE2_DIR)/init_httpd
 	@perl -i -p -e "s,\@LOGPATH@,$(call remove_quotes,$(PTXCONF_APACHE2_LOGDIR))/httpd.conf,g" $(APACHE2_DIR)/init_httpd
 	@$(call install_copy, apache2, 0, 0, 0755, $(APACHE2_DIR)/init_httpd, /etc/init.d/httpd, n)
@@ -258,7 +258,7 @@ endif
 # 		$(call install_copy, apache2, 12,102,0644,$$i,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/docroot/$$i,n); \
 # 	done
 # else
-# 	$(call install_copy, apache2, 12,102,0644,$(PTXDIST_TOPDIR)/projetcs/generic/index.html,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/docroot/index.html,n)
+# 	$(call install_copy, apache2, 12,102,0644,$(PTXDIST_TOPDIR)/projetcs-example/generic/index.html,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/docroot/index.html,n)
 # endif
 # 	@$(call install_copy, apache2, 12,102,0755,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/cgi-bin)
 # 	@$(call install_copy, apache2, 12,102,0644,$(APACHE2_DIR)/doc/cgi-examples/test-cgi,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/cgi-bin,n)
diff --git a/rules/host-ipkg.in b/rules/host-ipkg.in
index b78bb2714..a5cda073a 100644
--- a/rules/host-ipkg.in
+++ b/rules/host-ipkg.in
@@ -5,7 +5,7 @@ config HOST_IPKG
 	  ipkg is used on the development host to install packets into 
 	  some directory. Example: 
 
-		ipkg-cl -o . --force-depends -f ../projects/generic/etc/ipkg.conf install foo.ipk
+		ipkg-cl -o . --force-depends -f ../projects-example/generic/etc/ipkg.conf install foo.ipk
 
 
 config HOST_IPKG_EXTRACT_TEST
diff --git a/rules/ipkg.make b/rules/ipkg.make
index 72fa69174..9d047e933 100644
--- a/rules/ipkg.make
+++ b/rules/ipkg.make
@@ -121,7 +121,9 @@ $(STATEDIR)/ipkg.targetinstall: $(ipkg_targetinstall_deps_default)
 
 ifdef PTXCONF_IPKG_LOG_WRAPPER
 	@$(call install_copy, ipkg, 0, 0, 0755, $(IPKG_DIR)/.libs/ipkg-cl, /usr/bin/ipkg-cl)
-	@$(call install_copy, ipkg, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/bin/ipkg_log_wrapper, /usr/bin/ipkg, n)
+	@$(call install_copy, ipkg, 0, 0, 0755, \
+		$(PTXDIST_TOPDIR)/projects-example/generic/bin/ipkg_log_wrapper, \
+		/usr/bin/ipkg, n)
 else
 	@$(call install_copy, ipkg, 0, 0, 0755, $(IPKG_DIR)/.libs/ipkg-cl, /usr/bin/ipkg)
 endif
diff --git a/rules/ntp.make b/rules/ntp.make
index 4ea863a3f..4cc2f2e48 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -361,7 +361,7 @@ ifdef PTXCONF_NTP_NTPDATE
 endif
 ifdef PTXCONF_NTP_NTPD
 	@$(call install_copy, ntp, 0, 0, 0755, $(NTP_DIR)/ntpd/ntpd, /usr/sbin/ntpd)
-	@$(call install_copy, ntp, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/ntp, /etc/init.d/ntp-server, n)
+	@$(call install_copy, ntp, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/ntp, /etc/init.d/ntp-server, n)
 endif
 ifdef PTXCONF_NTP_NTPDC
 	@$(call install_copy, ntp, 0, 0, 0755, $(NTP_DIR)/ntpdc/ntpdc, /usr/sbin/ntpdc)
diff --git a/rules/proftpd.make b/rules/proftpd.make
index bec91fed2..c30507863 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -139,11 +139,17 @@ $(STATEDIR)/proftpd.targetinstall: $(proftpd_targetinstall_deps_default)
 	@$(call install_fixup, proftpd,DEPENDS,)
 	@$(call install_fixup, proftpd,DESCRIPTION,missing)
 
-	@$(call install_copy, proftpd, 0, 0, 0755, $(PROFTPD_DIR)/proftpd, /usr/sbin/proftpd)
-	@$(call install_copy, proftpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/proftpd, /etc/init.d/proftpd, n)
+	@$(call install_copy, proftpd, 0, 0, 0755, \
+		$(PROFTPD_DIR)/proftpd, \
+		/usr/sbin/proftpd)
+	@$(call install_copy, proftpd, 0, 0, 0755, \
+		$(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/proftpd, \
+		/etc/init.d/proftpd, n)
 	
 ifdef $(PTXCONF_PROFTPD_DEFAULTCONFIG)	
-	@$(call install_copy, proftpd, 11, 101, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/proftpd.conf, /etc/proftpd.conf, n)
+	@$(call install_copy, proftpd, 11, 101, 0644, \
+		$(PTXDIST_TOPDIR)/projects-example/generic/etc/proftpd.conf, \
+		/etc/proftpd.conf, n)
 endif	
 
 	@$(call install_finish, proftpd)
diff --git a/rules/pureftpd.make b/rules/pureftpd.make
index f618ad99d..5e2e8cb73 100644
--- a/rules/pureftpd.make
+++ b/rules/pureftpd.make
@@ -161,7 +161,7 @@ ifdef PTXCONF_ROOTFS_ETC_INITD_PUREFTPD
 ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_PUREFTPD_USER_FILE)),)
 	@$(call install_copy, pureftpd, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_PUREFTPD_USER_FILE), /etc/init.d/pure-ftpd, n)
 else
-	@$(call install_copy, pureftpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/pure-ftpd, /etc/init.d/pure-ftpd, n)
+	@$(call install_copy, pureftpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/pure-ftpd, /etc/init.d/pure-ftpd, n)
 endif
 endif
 
diff --git a/rules/rootfs.in b/rules/rootfs.in
index 68ea46b80..23f4da6c8 100644
--- a/rules/rootfs.in
+++ b/rules/rootfs.in
@@ -379,7 +379,7 @@ config ROOTFS_ETC_INITD
 	select BB_CONFIG_RUN_PARTS      if BUSYBOX
 	help
 	  When enabled, this option copies the files from 
-	  ${PTXDIST_TOPDIR}/projects/generic/etc/init.d to the target root 
+	  ${PTXDIST_TOPDIR}/projects-example/generic/etc/init.d to the target root 
 	  filesystem. The files contain useful defaults for most projects, 
 	  so if you don't intend to use your completely self-made etc
 	  directory you should problably switch this on. 
@@ -495,7 +495,7 @@ menuconfig ROOTFS_ETC_INITD_TELNETD
 			bool
 			prompt "Use default telnetd"
 			help
-			  A file from projects/generic/etc/init.d/telnetd will be used
+			  A file from projects-example/generic/etc/init.d/telnetd will be used
 
 		config ROOTFS_ETC_INITD_TELNETD_USER
 			depends on ROOTFS_ETC_INITD_TELNETD
@@ -595,7 +595,7 @@ menuconfig ROOTFS_ETC_INITD_HTTPD
 			bool
 			prompt "Use default httpd"
 			help
-			  A file from projects/generic/etc/init.d/httpd will be used.
+			  A file from projects-example/generic/etc/init.d/httpd will be used.
 
 		config ROOTFS_ETC_INITD_HTTPD_USER
 			bool
@@ -646,7 +646,7 @@ menuconfig ROOTFS_ETC_INITD_UDEV
 			bool
 			prompt "Use default udevd"
 			help
-			  A file from projects/generic/etc/init.d/udev will be used
+			  A file from projects-example/generic/etc/init.d/udev will be used
 
 		config ROOTFS_ETC_INITD_UDEV_USER
 			depends on ROOTFS_ETC_INITD && ROOTFS_ETC_INITD_UDEV
@@ -698,7 +698,7 @@ menuconfig ROOTFS_ETC_INITD_PUREFTPD
 			bool
 			prompt "Use default pure-ftpd"
 			help
-			  A file from projects/generic/etc/init.d/pure-ftpd will be used.
+			  A file from projects-example/generic/etc/init.d/pure-ftpd will be used.
 
 		config ROOTFS_ETC_INITD_PUREFTPD_USER
 			bool
@@ -748,7 +748,7 @@ menuconfig ROOTFS_ETC_INITD_THTTPD
 			bool
 			prompt "Use default thttpd script"
 			help
-			  The file from projects/generic/etc/init.d/thttpd will be used.
+			  The file from projects-example/generic/etc/init.d/thttpd will be used.
 
 		config ROOTFS_ETC_INITD_THTTPD_USER
 			bool
diff --git a/rules/rootfs.make b/rules/rootfs.make
index 5732b783c..10d7ed5e3 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -161,7 +161,7 @@ endif
 	#
 
 ifdef PTXCONF_ROOTFS_GENERIC_FSTAB
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/fstab, /etc/fstab, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/fstab, /etc/fstab, n)
 endif
 
 ifdef PTXCONF_ROOTFS_GENERIC_MTAB
@@ -169,11 +169,11 @@ ifdef PTXCONF_ROOTFS_GENERIC_MTAB
 endif
 
 ifdef PTXCONF_ROOTFS_GENERIC_GROUP
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/group,        /etc/group, n)
-	@$(call install_copy, rootfs, 0, 0, 0640, $(PTXDIST_TOPDIR)/projects/generic/etc/gshadow,      /etc/gshadow, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/group,        /etc/group, n)
+	@$(call install_copy, rootfs, 0, 0, 0640, $(PTXDIST_TOPDIR)/projects-example/generic/etc/gshadow,      /etc/gshadow, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_HOSTNAME
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/hostname,     /etc/hostname, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/hostname,     /etc/hostname, n)
 
 	x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_HOSTNAME))"; \
 	if [ -n "$$x" ]; then \
@@ -183,10 +183,10 @@ ifdef PTXCONF_ROOTFS_GENERIC_HOSTNAME
 	fi
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_HOSTS
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/hosts,        /etc/hosts, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/hosts,        /etc/hosts, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_INITTAB
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/inittab,      /etc/inittab, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/inittab,      /etc/inittab, n)
 
 	x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_CONSOLE))"; \
 	if [ -n "$$x" ]; then \
@@ -203,7 +203,7 @@ ifdef PTXCONF_ROOTFS_GENERIC_INITTAB
 	fi
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_IPKG_CONF
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/ipkg.conf, /etc/ipkg.conf, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/ipkg.conf, /etc/ipkg.conf, n)
 	x="$(call remove_quotes,$(PTXCONF_ROOTFS_GENERIC_IPKG_CONF_URL))"; \
 	echo $$x; \
 	perl -i -p -e "s,\@SRC@,src $$x,g" $(ROOTDIR)/etc/ipkg.conf; \
@@ -214,13 +214,13 @@ ifdef PTXCONF_ROOTFS_GENERIC_IPKG_CONF
 	perl -i -p -e "s,\@ARCH@,$$x,g" $(IMAGEDIR)/ipkg/etc/ipkg.conf;
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_NSSWITCH
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/nsswitch.conf,/etc/nsswitch.conf, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/nsswitch.conf,/etc/nsswitch.conf, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_PASSWD
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/passwd,       /etc/passwd, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/passwd,       /etc/passwd, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_PROFILE
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/profile,      /etc/profile, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/profile,      /etc/profile, n)
 	
 	x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_PS1))"; \
 	echo $$x; \
@@ -238,16 +238,16 @@ ifdef PTXCONF_ROOTFS_GENERIC_PROFILE
 	perl -i -p -e "s,\@PS4@,\"$$x\",g" $(IMAGEDIR)/ipkg/etc/profile;
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_PROTOCOLS
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/protocols,    /etc/protocols, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/protocols,    /etc/protocols, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_RESOLV
-	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects/generic/etc/resolv.conf,  /etc/resolv.conf, n)
+	@$(call install_copy, rootfs, 0, 0, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/etc/resolv.conf,  /etc/resolv.conf, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_INETD
 	inetdconf=`mktemp`; \
 	servicesfile=`mktemp`; \
-	cp $(PTXDIST_TOPDIR)/projects/generic/etc/inetd.conf $$inetdconf; \
-	cp $(PTXDIST_TOPDIR)/projects/generic/etc/services $$servicesfile; \
+	cp $(PTXDIST_TOPDIR)/projects-example/generic/etc/inetd.conf $$inetdconf; \
+	cp $(PTXDIST_TOPDIR)/projects-example/generic/etc/services $$servicesfile; \
 	if [ "$(PTXCONF_INETUTILS_RSHD)" = "y" ]; then \
 		sed -ie "s,@RSHD@,shell stream tcp nowait root /usr/sbin/rshd,g" $$inetdconf; \
 		sed -ie "s,@RSHD@,shell 514/tcp cmd,g" $$servicesfile; \
@@ -270,11 +270,11 @@ ifdef PTXCONF_ROOTFS_GENERIC_INETD
 	rm -f $$servicesfile
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_SHADOW
-	@$(call install_copy, rootfs, 0, 0, 0640, $(PTXDIST_TOPDIR)/projects/generic/etc/shadow,       /etc/shadow, n)
-	@$(call install_copy, rootfs, 0, 0, 0600, $(PTXDIST_TOPDIR)/projects/generic/etc/shadow-,      /etc/shadow-, n)
+	@$(call install_copy, rootfs, 0, 0, 0640, $(PTXDIST_TOPDIR)/projects-example/generic/etc/shadow,       /etc/shadow, n)
+	@$(call install_copy, rootfs, 0, 0, 0600, $(PTXDIST_TOPDIR)/projects-example/generic/etc/shadow-,      /etc/shadow-, n)
 endif
 ifdef PTXCONF_ROOTFS_GENERIC_UDHCPC
-	@$(call install_copy, rootfs, 0, 0, 0744, $(PTXDIST_TOPDIR)/projects/generic/etc/udhcpc.script,/etc/udhcpc.script, n)
+	@$(call install_copy, rootfs, 0, 0, 0744, $(PTXDIST_TOPDIR)/projects-example/generic/etc/udhcpc.script,/etc/udhcpc.script, n)
 endif
 
 	#
@@ -284,28 +284,28 @@ ifdef PTXCONF_ROOTFS_ETC_INITD
 
 	# Copy generic etc/init.d
 	@$(call install_copy, rootfs, 0, 0, 0755, /etc/init.d)
-	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/rcS,        /etc/init.d/rcS, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/rcS,        /etc/init.d/rcS, n)
 
 ifdef ROOTFS_ETC_INITD_LOGROTATE
-	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/logrotate, /etc/init.d/logrotate, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/logrotate, /etc/init.d/logrotate, n)
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_INETD
-	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/inetd, /etc/init.d/inetd, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/inetd, /etc/init.d/inetd, n)
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_INETD_LINK),"")
 	@$(call install_link, rootfs, /etc/init.d/inetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_INETD_LINK))
 endif
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_MODULES
-	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/modules, /etc/init.d/modules, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/modules, /etc/init.d/modules, n)
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_MODULES_LINK),"")
 	@$(call install_link, rootfs, /etc/init.d/modules, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_MODULES_LINK))
 endif
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_NETWORKING
-	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/networking, /etc/init.d/networking, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/networking, /etc/init.d/networking, n)
 	@$(call install_copy, rootfs, 0, 0, 0755, /etc/network/if-down.d)
 	@$(call install_copy, rootfs, 0, 0, 0755, /etc/network/if-up.d)
 	@$(call install_copy, rootfs, 0, 0, 0755, /etc/network/if-post-down.d)
@@ -319,14 +319,14 @@ endif
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD
-	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/telnetd,    /etc/init.d/telnetd, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/telnetd,    /etc/init.d/telnetd, n)
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK),"")
 	@$(call install_link, rootfs, /etc/init.d/telnetd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_TELNETD_LINK))
 endif
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_HTTPD
-	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/httpd,    /etc/init.d/httpd, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/httpd,    /etc/init.d/httpd, n)
 	x="$(call remove_quotes,$(PTXCONF_APACHE2_CONFIGDIR))/httpd.conf"; \
 	echo $$x; \
 	perl -i -p -e "s,\@APACHECONFIG@,$$x,g" $(ROOTDIR)/etc/init.d/httpd; \
@@ -338,13 +338,17 @@ endif
 endif
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_STARTUP
-	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/startup,    /etc/init.d/startup, n)
+	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/startup,    /etc/init.d/startup, n)
 endif
 
 	@$(call install_copy, rootfs, 0, 0, 0755, /etc/rc.d)
 
 ifdef PTXCONF_ROOTFS_ETC_INITD_BANNER
-	@$(call install_copy, rootfs, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/banner,     /etc/init.d/banner, n)
+
+	@$(call install_copy, rootfs, 0, 0, 0755, \
+		$(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/banner, \
+		/etc/init.d/banner, n)
+
 	x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_VENDOR))"; \
 	perl -i -p -e "s,\@VENDOR@,$$x,g" $(ROOTDIR)/etc/init.d/banner; \
 	perl -i -p -e "s,\@VENDOR@,$$x,g" $(IMAGEDIR)/ipkg/etc/init.d/banner; \
diff --git a/rules/thttpd.make b/rules/thttpd.make
index 0768f279c..85ed48a20 100644
--- a/rules/thttpd.make
+++ b/rules/thttpd.make
@@ -119,7 +119,7 @@ ifdef PTXCONF_ROOTFS_ETC_INITD_THTTPD
 ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_USER_FILE)),)
 	@$(call install_copy, thttpd, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_THTTPD_USER_FILE), /etc/init.d/thttpd, n)
 else
-	@$(call install_copy, thttpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/thttpd, /etc/init.d/thttpd, n)
+	@$(call install_copy, thttpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/thttpd, /etc/init.d/thttpd, n)
 endif
 endif
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK),"")
@@ -127,7 +127,7 @@ ifneq ($(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK),"")
 	@$(call install_link, thttpd, ../init.d/thttpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK))
 endif
 	@$(call install_copy, thttpd, 12, 102, 0755, /var/www)
-	@$(call install_copy, thttpd, 12, 102, 0644, $(PTXDIST_TOPDIR)/projects/generic/thttpd.html, /var/www/index.html, n)
+	@$(call install_copy, thttpd, 12, 102, 0644, $(PTXDIST_TOPDIR)/projects-example/generic/thttpd.html, /var/www/index.html, n)
 
 	@$(call install_finish, thttpd)
 	@$(call touch, $@)
diff --git a/rules/udev.make b/rules/udev.make
index 9b5a1c789..b53cfd870 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -111,12 +111,12 @@ $(STATEDIR)/udev.targetinstall: $(udev_targetinstall_deps_default)
 	@$(call install_fixup, udev,DEPENDS,)
 	@$(call install_fixup, udev,DESCRIPTION,missing)
 
-	@$(call install_copy, udev, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/udev/udev.conf, /etc/udev/udev.conf, n)
+	@$(call install_copy, udev, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/udev/udev.conf, /etc/udev/udev.conf, n)
 ifdef PTXCONF_ROOTFS_ETC_INITD_UDEV
 ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_UDEV_USER_FILE)),)
 	@$(call install_copy, udev, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_UDEV_USER_FILE), /etc/init.d/udev, n)
 else
-	@$(call install_copy, udev, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/udev, /etc/init.d/udev, n)
+	@$(call install_copy, udev, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/udev, /etc/init.d/udev, n)
 endif
 endif
 
diff --git a/rules/utelnetd.make b/rules/utelnetd.make
index b01c58613..93430daa2 100644
--- a/rules/utelnetd.make
+++ b/rules/utelnetd.make
@@ -103,7 +103,9 @@ $(STATEDIR)/utelnetd.targetinstall: $(utelnetd_targetinstall_deps_default)
 	@$(call install_fixup, utelnetd,DESCRIPTION,missing)
 ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD
 ifdef PTXCONF_ROOTFS_ETC_INITD_TELNETD_DEFAULT 
-	@$(call install_copy, utelnetd, 0, 0, 0755, $(PTXDIST_TOPDIR)/projects/generic/etc/init.d/telnetd, /etc/init.d/telnetd, n)
+	@$(call install_copy, utelnetd, 0, 0, 0755, \
+		$(PTXDIST_TOPDIR)/projects-example/generic/etc/init.d/telnetd, \
+		/etc/init.d/telnetd, n)
 else
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_TELNETD_USER_FILE),"")
 	@$(call install_copy, utelnetd, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_TELNETD_USER_FILE), /etc/init.d/telnetd, n)