X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile.in;h=8ccb0ef98bd9fde5a5b733ebf926306b90cfbea6;hb=35f68724b76ea85e9b949f05ad82b82a7144989c;hp=192b02715ec316b1fedfa93fe481f703a912f5f8;hpb=9414deeb6210c5f2c5219c6e99eb329b4bb1be26;p=virt-mem.git

diff --git a/Makefile.in b/Makefile.in
index 192b027..8ccb0ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,31 +20,41 @@ PACKAGE		= @PACKAGE_NAME@
 VERSION		= @PACKAGE_VERSION@
 
 INSTALL		= @INSTALL@
+MKDIR_P		= @MKDIR_P@
+datarootdir	= @datarootdir@
+mandir		= @mandir@
 
 HAVE_PERLDOC    = @HAVE_PERLDOC@
 
-TOOLS		= uname dmesg
-
-SUBDIRS		= lib $(TOOLS)
+TOOLS		= uname dmesg ps
 
 ifeq ($(HAVE_PERLDOC),perldoc)
-TARGETS         += virt-mem.1 virt-mem.txt $(TOOLS:%=virt-%.1)
+MANPAGES        = virt-mem.1 $(TOOLS:%=virt-%.1)
+TEXTMANPAGES	= virt-mem.txt
 endif
 
-all install: $(TARGETS)
-	for d in $(SUBDIRS) po; do \
+TARGETS		= $(MANPAGES) $(TEXTMANPAGES)
+
+all: $(TARGETS)
+	for d in lib $(TOOLS) po; do \
+	  $(MAKE) -C $$d $@; \
+	  if [ $$? -ne 0 ]; then exit 1; fi; \
+	done
+
+install: install-man
+	for d in lib $(TOOLS) po; do \
 	  $(MAKE) -C $$d $@; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 
 depend doc:
-	for d in $(SUBDIRS); do \
+	for d in lib $(TOOLS); do \
 	  $(MAKE) -C $$d $@; \
 	  if [ $$? -ne 0 ]; then exit 1; fi; \
 	done
 
 clean:
-	for d in . $(SUBDIRS); do \
+	for d in . lib $(TOOLS); do \
 	  (cd $$d; rm -f *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a \
 	    *.so *.opt *~ *.dll *.exe *.annot core); \
 	done
@@ -53,6 +63,7 @@ clean:
 	done
 	rm -f uname/virt-uname
 	rm -f dmesg/virt-dmesg
+	rm -f ps/virt-ps
 
 distclean: clean
 	rm -f config.h config.log config.status configure
@@ -72,6 +83,15 @@ virt-mem.txt: virt-mem.pod
 
 virt-%.1:
 	echo '.so man1/virt-mem.1' > $@
+
+install-man:
+	$(MKDIR_P) $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -m 0644 $(MANPAGES) $(DESTDIR)$(mandir)/man1/
+
+else
+
+install-man:
+
 endif
 
 # Distribution.
@@ -81,7 +101,9 @@ dist:
 	rm -rf $(PACKAGE)-$(VERSION)
 	mkdir $(PACKAGE)-$(VERSION)
 	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
+	hg log --style changelog > $(PACKAGE)-$(VERSION)/ChangeLog
 	$(INSTALL) -m 0755 configure $(PACKAGE)-$(VERSION)/
+	$(INSTALL) -m 0644 config.h.in $(PACKAGE)-$(VERSION)/
 	tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
 	rm -rf $(PACKAGE)-$(VERSION)
 	ls -l $(PACKAGE)-$(VERSION).tar.gz