[src/netbsd-1-5]: src Pull up Makefile.inc (etc.i386 1.22, bootfloppy-common ...

[toddpw <toddpw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c844e0551095
branches:  netbsd-1-5
changeset: 489047:c844e0551095
user:      toddpw <toddpw%NetBSD.org@localhost>
date:      Fri Aug 11 09:56:53 2000 +0000

description:
Pull up Makefile.inc (etc.i386 1.22, bootfloppy-common 1.29, fdset-common 1.22)
  1.22 etc/etc.i386/Makefile.inc
  1.29 distrib/i386/floppies/bootfloppy-common/Makefile.inc
  1.22 distrib/i386/floppies/fdset-common/Makefile.inc
Change $RELEASEDIR/installation/floppies to $RELEASEDIR/installation/floppy,
in accordance with release(7). This is actually a stray diff from the 1.4.2
release cycle which is only now being carried forward. (cough cough)

diffstat:

 distrib/i386/floppies/bootfloppy-common/Makefile.inc |  8 ++++----
 distrib/i386/floppies/fdset-common/Makefile.inc      |  8 ++++----
 etc/etc.i386/Makefile.inc                            |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (59 lines):

diff -r 05637015499b -r c844e0551095 distrib/i386/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/i386/floppies/bootfloppy-common/Makefile.inc      Fri Aug 11 03:38:29 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy-common/Makefile.inc      Fri Aug 11 09:56:53 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.26.4.2 2000/07/20 16:54:49 rh Exp $
+#      $NetBSD: Makefile.inc,v 1.26.4.3 2000/08/11 09:56:53 toddpw Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -86,9 +86,9 @@
        strip boot
 
 release:
-       -mkdir -p ${RELEASEDIR}/installation/floppies
-       cp -p ${IMAGE} ${RELEASEDIR}/installation/floppies
-       for f in ${RELEASEDIR}/installation/floppies/${IMAGE}; do \
+       -mkdir -p ${RELEASEDIR}/installation/floppy
+       cp -p ${IMAGE} ${RELEASEDIR}/installation/floppy
+       for f in ${RELEASEDIR}/installation/floppy/${IMAGE}; do \
                gzip <$$f >$$f.gz; \
        done
        
diff -r 05637015499b -r c844e0551095 distrib/i386/floppies/fdset-common/Makefile.inc
--- a/distrib/i386/floppies/fdset-common/Makefile.inc   Fri Aug 11 03:38:29 2000 +0000
+++ b/distrib/i386/floppies/fdset-common/Makefile.inc   Fri Aug 11 09:56:53 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.16.4.2 2000/07/19 17:27:41 thorpej Exp $
+#      $NetBSD: Makefile.inc,v 1.16.4.3 2000/08/11 09:56:54 toddpw Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -84,9 +84,9 @@
        strip boot
 
 release:
-       -mkdir -p ${RELEASEDIR}/installation/floppies
-       cp -p ${BASENAME}?.fs ${RELEASEDIR}/installation/floppies
-       for f in ${RELEASEDIR}/installation/floppies/${BASENAME}?.fs; do \
+       -mkdir -p ${RELEASEDIR}/installation/floppy
+       cp -p ${BASENAME}?.fs ${RELEASEDIR}/installation/floppy
+       for f in ${RELEASEDIR}/installation/floppy/${BASENAME}?.fs; do \
                gzip <$$f >$$f.gz; \
        done
        
diff -r 05637015499b -r c844e0551095 etc/etc.i386/Makefile.inc
--- a/etc/etc.i386/Makefile.inc Fri Aug 11 03:38:29 2000 +0000
+++ b/etc/etc.i386/Makefile.inc Fri Aug 11 09:56:53 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.21 2000/05/28 17:31:27 thorpej Exp $
+#      $NetBSD: Makefile.inc,v 1.21.2.1 2000/08/11 09:56:53 toddpw Exp $
 #
 #      etc.i386/Makefile.inc -- i386-specific etc Makefile targets
 #
@@ -17,4 +17,4 @@
        cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE}
        cd ${.CURDIR}/../distrib/i386 && ${MAKE} release
        cd ${.CURDIR}/../distrib/notes && ${MAKE} release
-       sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/floppies '*.gz'
+       sh ../distrib/sets/makesums -t ${RELEASEDIR}/installation/floppy '*.gz'