From owner-cvs-bin  Sun Nov 24 01:32:27 1996
Return-Path: owner-cvs-bin
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id BAA06129
          for cvs-bin-outgoing; Sun, 24 Nov 1996 01:32:27 -0800 (PST)
Received: (from joerg@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id BAA06077;
          Sun, 24 Nov 1996 01:31:50 -0800 (PST)
Date: Sun, 24 Nov 1996 01:31:50 -0800 (PST)
From: Joerg Wunsch <joerg>
Message-Id: <199611240931.BAA06077@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-bin, cvs-sbin
Subject: cvs commit:  src/bin Makefile.inc src/bin/ed Makefile src/sbin/init Makefile src/sbin Makefile.inc
Sender: owner-cvs-bin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

joerg       96/11/24 01:31:46

  Branch:      bin       RELENG_2_1_0
               bin/ed    RELENG_2_1_0
               sbin      RELENG_2_1_0
               sbin/init  RELENG_2_1_0
  Modified:    bin       Makefile.inc
               bin/ed    Makefile
               sbin      Makefile.inc
               sbin/init  Makefile
  Log:
  Merge the Makefile changes from -current that allow to build both
  versions, the DES-contaminated and the exportable one, during a `make
  release'.  This should fix the problems where /sbin/init and /bin/ed
  have been missing in the `des' distribution of 2.1.6.
  
  Requested by:	jkh
  Reviewed by:	markm
  
  Revision  Changes    Path
  1.4.6.3   +11 -0     src/bin/Makefile.inc
  1.10.4.3  +9 -2      src/bin/ed/Makefile
  1.2.6.1   +16 -0     src/sbin/Makefile.inc
  1.3.6.1   +10 -2     src/sbin/init/Makefile