*** empty log message ***

9 files changed, 43 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 154d29e9..b26dd047 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Jul 20 15:42:43 1996  Michael I. Bushnell, p/BSG  <mib@gnu.ai.mit.edu>
+
+	* Makeconf (lndist): Find DISTFILES in $(srcdir).
+	* Makefile (date): Delete vare.
+	(version, dirname): New vars.
+	(dist): Operate in $(srcdir).  Use $(dirname) for the tar dir name.
+	(hurd-snap): Create in $(srcdir).
+
 Thu Jul 18 00:40:04 1996  Michael I. Bushnell, p/BSG  <mib@gnu.ai.mit.edu>
 
 	* Makeconf (install): Depend on $(includedir)/$(installhdrsubdir).
diff --git a/Makeconf b/Makeconf
index c903bc78..20a18256 100644
--- a/Makeconf
+++ b/Makeconf
@@ -232,7 +232,7 @@ endif
 # Making a snapshot
 distfiles = Makefile ChangeLog $(SRCS) $(LCLHDRS) $(DIST_FILES)
 lndist: $(distfiles) $(top_srcdir)/hurd-snap/$(dir) FORCE
-	ln $(distfiles) $(top_srcdir)/hurd-snap/$(dir)
+	ln $(addprefix $(srcdir)/,$(distfiles)) $(top_srcdir)/hurd-snap/$(dir)
 
 ifeq ($(dir),.)
 $(top_srcdir)/hurd-snap/$(dir):
diff --git a/Makefile b/Makefile
index 07e95229..9525ef12 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ all: $(addsuffix -all,$(lib-subdirs) $(working-prog-subdirs))
 %-all:
 	$(MAKE) -C $* all
 
-%-lndist: hurd-snap
+%-lndist: $(top_srcdir)/hurd-snap
 	$(MAKE) -C $* lndist no_deps=t
 
 %-clean:
@@ -65,14 +65,20 @@ all: $(addsuffix -all,$(lib-subdirs) $(working-prog-subdirs))
 %-TAGS:
 	$(MAKE) -C $* TAGS no_deps=t
 
-hurd-snap:
-	mkdir hurd-snap
+$(srcdir)/hurd-snap:
+	mkdir $(srcdir)/hurd-snap
 
-date:=$(shell date +%y%m%d)
-dist: hurd-snap $(addsuffix -lndist,$(filter-out $(subdirs-nodist), $(subdirs))) lndist
-	mv hurd-snap hurd-snap-$(date)
-	tar cfz hurd-snap-$(date).tar.gz hurd-snap-$(date)
-	rm -rf hurd-snap-$(date)
+ifeq ($(version),)
+version:=$(shell date +%y%m%d)
+dirname:=hurd-snap
+else
+dirname:=hurd
+endif
+
+dist: $(srcdir)/hurd-snap $(addsuffix -lndist,$(filter-out $(subdirs-nodist), $(subdirs))) lndist
+	mv $(srcdir)/hurd-snap $(srcdir)/$(dirname)-$(version)
+	tar cfz $(srcdir)/$(dirname)-$(version).tar.gz $(srcdir)/$(dirname)-$(version)
+	rm -rf $(srcdir)/$(dirname)-$(date)
 
 clean: $(addsuffix -clean,$(lib-subdirs)) $(addsuffix -clean,$(working-prog-subdirs)) clean-misc
 
diff --git a/libthreads/ChangeLog b/libthreads/ChangeLog
index 3d0d177d..ebb6a424 100644
--- a/libthreads/ChangeLog
+++ b/libthreads/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 20 15:47:24 1996  Michael I. Bushnell, p/BSG  <mib@gnu.ai.mit.edu>
+
+	* Makefile (lndist-i386-files): Look for I386SRCS and I386HDRS in
+	$(srcdir). 
+
 Thu Jun  6 07:29:31 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* malloc.c (more_memory): Use assert_perror instead of MACH_CALL.
diff --git a/libthreads/Makefile b/libthreads/Makefile
index 193ebd17..d915751a 100644
--- a/libthreads/Makefile
+++ b/libthreads/Makefile
@@ -48,7 +48,7 @@ CFLAGS := $(filter-out -Wall,$(CFLAGS))
 lndist: lndist-i386-files
 
 lndist-i386-files: $(top_srcdir)/hurd-snap/$(dir)/i386
-	ln $(I386SRCS) $(I386HDRS) $<
+	ln $(addprefix $(srcdir)/,$(I386SRCS) $(I386HDRS)) $<
 
 $(top_srcdir)/hurd-snap/$(dir)/i386:
 	mkdir $@
diff --git a/pfinet/ChangeLog b/pfinet/ChangeLog
index 5f046154..a7f861ed 100644
--- a/pfinet/ChangeLog
+++ b/pfinet/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 20 15:48:29 1996  Michael I. Bushnell, p/BSG  <mib@gnu.ai.mit.edu>
+
+	* Makefile (lndist-asm-files): Look for files in $(srcdir).
+	(lndist-linux-files): Likewise.
+	(lndist-linux-inet-files): Likewise.
+
 Fri Jul 19 09:39:08 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* pfinet.h (make_sock_user): Declaration updated.
diff --git a/pfinet/Makefile b/pfinet/Makefile
index ebdcda07..f36e8693 100644
--- a/pfinet/Makefile
+++ b/pfinet/Makefile
@@ -62,13 +62,13 @@ $(OBJS): config.h
 lndist: lndist-linux-inet-files lndist-linux-files lndist-asm-files
 
 lndist-linux-inet-files: $(top_srcdir)/hurd-snap/$(dir)/linux-inet
-	ln $(addprefix linux-inet/,$(LINUXSRCS) $(UNUSEDSRC) $(LINUXHDRS)) $<
+	ln $(addprefix $(srcdir)/linux-inet/,$(LINUXSRCS) $(UNUSEDSRC) $(LINUXHDRS)) $<
 
 lndist-linux-files: $(top_srcdir)/hurd-snap/$(dir)/linux
-	ln $(addprefix linux/,$(FROBBEDLINUXHEADERS)) $<
+	ln $(addprefix $(srcdir)/linux/,$(FROBBEDLINUXHEADERS)) $<
 
 lndist-asm-files: $(top_srcdir)/hurd-snap/$(dir)/asm
-	ln $(addprefix asm/,$(ASMHEADERS)) $<
+	ln $(addprefix $(srcdir)/asm/,$(ASMHEADERS)) $<
 
 $(top_srcdir)/hurd-snap/$(dir)/linux-inet:
 	mkdir $@
diff --git a/utils/ChangeLog b/utils/ChangeLog
index 3e4ef0ac..a20f8721 100644
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -47,6 +47,11 @@ Sun Jul 21 03:00:10 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 	* portinfo.c (main): For no args, use argp_usage.
 	(options): Minor fixes.
 
+Sat Jul 20 15:54:10 1996  Michael I. Bushnell, p/BSG  <mib@gnu.ai.mit.edu>
+
+	* Makefile (DIST_FILES): Deleted var (which was `shd.ChangeLog').
+	(shd.ChangeLog): Deleted file.
+	
 Fri Jul 19 21:09:57 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* settrans.c (options): Rearrange slightly.
diff --git a/utils/Makefile b/utils/Makefile
index f2ac188b..ebbc8d06 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -25,7 +25,6 @@ special-targets = mount loginpr sush uptime
 SRCS = shd.c ps.c su.c settrans.c sync.c showtrans.c \
 	mount.sh fsysopts.c storeinfo.c login.c loginpr.sh sush.sh w.c \
 	uptime.sh psout.c hurdids.c vmstat.c portinfo.c devprobe.c
-DIST_FILES = shd.ChangeLog
 
 OBJS = $(filter-out loginpr.sh mount.sh sush.sh uptime.sh,$(SRCS:.c=.o))