X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2FMaketop;h=743c7b9273d19fb0424163652c938f8576928b45;hb=c8c688e0b06fdacb20b28b66b9b0608dae8ca0dc;hp=23d1510adab80077441c93ca042bacb8c3fc6e6b;hpb=91972e1a8200da60d621b5341fc2e672a6d9f77b;p=libucw.git

diff --git a/build/Maketop b/build/Maketop
index 23d1510a..743c7b92 100644
--- a/build/Maketop
+++ b/build/Maketop
@@ -16,7 +16,7 @@ LDFLAGS=$(LOPT) $(LEXTRA)
 DIRS=
 PROGS=
 CONFIGS=
-CONFIG_DIR=cf
+CONFIG_DIR=etc
 TESTS=
 EXTRA_RUNDIRS=tmp log
 INSTALL_RUNDIRS=bin lib
@@ -39,6 +39,7 @@ SOEXT=bundle
 else
 SOEXT=so
 endif
+SO_RUNDIR=lib
 
 # Whenever "make -s" (silent) is run, turn on verbose mode (paradoxical, but gives the right result)
 ifneq ($(findstring s,$(MAKEFLAGS)),)
@@ -59,12 +60,13 @@ endif
 # Clean needs to be a double-colon rule since we want sub-makefiles to be able
 # to define their own cleanup actions.
 dust::
-	rm -f `find . -path "*~" -or -name "\#*\#" -or -name core`
+	rm -f `find . -path "*~" -or -name "\#*\#"`
 	rm -f allocs.tmp cscope.out TAGS
 
 clean:: dust
-	rm -rf `find obj -mindepth 1 -maxdepth 1 -not \( -name config.mk -o -name autoconf.h \)`
-	rm -rf tests run/{bin,lib,include,.tree-stamp}
+	rm -rf `find obj/ucw -mindepth 1 -maxdepth 1 -not -name autoconf.h`
+	rm -rf `find obj -mindepth 1 -maxdepth 1 -not \( -name config.mk -o -name autoconf.h -o -name ucw \)`
+	rm -rf tests run/{bin,lib,include,.tree-stamp,doc}
 
 distclean:: clean
 	rm -rf obj run