cleanups in the directory creation rules
[util-vserver.git] / util-vserver / distrib / Makefile.am
index 8ecfec5..26e1289 100644 (file)
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-confdir                        =  $(sysconfdir)/vservers
-defaultsdir            =  $(pkglibdir)/defaults
-distribdir             =  $(pkglibdir)/distributions
-confdistribdir         =  $(confdir)/.distributions
-confdefaultsdir                =  $(confdir)/.defaults
-confdefaultsinitdir    =  $(confdefaultsdir)/init
+confdir =              $(sysconfdir)/vservers
+defaultsdir =          $(pkglibdir)/defaults
+distribdir =           $(pkglibdir)/distributions
+confdistribdir =       $(confdir)/.distributions
+confdefaultsdir =      $(confdir)/.defaults
 
-defaults_DATA          =  misc/mtab
+defaults_DATA =                misc/debootstrap.uri \
+                       misc/fstab \
+                       misc/mtab \
+                       misc/vprocunhide-files \
+                       misc/vunify-exclude
 
-nobase_distrib_SCRIPTS =  redhat/initpost
+nobase_distrib_SCRIPTS =  redhat/initpost \
+                          redhat/initpre
 
 nobase_distrib_DATA    =  defaults/devs \
+                          defaults/apt.conf \
                           defaults/rpm/macros \
                           defaults/apt/apt.conf \
                           rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \
@@ -48,7 +53,10 @@ redhat_style         =  rh9 fc1
 
 install-data-hook:
                        l="$(redhat_style)"; for i in $$l; do \
-                               ln -sf ../redhat/initpost $(DESTDIR)$(distribdir)/$$i/; \
+                               ln -sf ../redhat/initpost $(DESTDIR)$(distribdir)/$$i/ && \
+                               ln -sf ../redhat/initpre  $(DESTDIR)$(distribdir)/$$i/; \
                        done
-                       $(mkinstalldirs) $(DESTDIR)$(confdir) $(DESTDIR)$(confdefaultsdir) \
-                               $(DESTDIR)$(confdefaultsinitdir)
+                       $(mkinstalldirs) $(DESTDIR)$(confdir) \
+                               $(DESTDIR)$(confdefaultsdir) \
+                               $(DESTDIR)$(confdefaultsdir)/apps \
+                               $(DESTDIR)$(confdefaultsdir)/files