X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C78B58.00AD3B10@onstor-exch02.onstor.net>; Mon, 30 Apr 2007 11:47:28 -0700
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-class: urn:content-classes:message
Subject: RE: Please review Kerberos Build changes
Date: Mon, 30 Apr 2007 11:47:28 -0700
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E0221577C@onstor-exch02.onstor.net>
In-Reply-To: <20070430114418.218a37c7@ripper.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Please review Kerberos Build changes
Thread-Index: AceLV49zW7aQuiT8SVyiwkgCvZ9kUQAAA/bQ
From: "Larry Scheer" <larry.scheer@onstor.com>
To: "Andy Sharp" <andy.sharp@onstor.com>

Here it is again. I needed to correct a typo in it this is just p4 diff
with no options. It may be easier to spot. It is the last line that has
a $(SUDO) mv:

> # setting INSTALL_DATA=3D: in the kerberos install disables install =
man
pages
268c269,271
<       $(SUDO) make install DESTDIR=3D${DESTDIR} CROSSDIR=3D""
---
>       $(SUDO) make install DESTDIR=3D${DESTDIR} CROSSDIR=3D""
INSTALL_DATA=3D: \
>       INSTALL_SHLIB=3D"install -m 755"
>       $(SUDO) mv $(DESTDIR)/usr/kerberos/bin/kinit $(DESTDIR)/usr/bin

-----Original Message-----
From: Andy Sharp=20
Sent: Monday, April 30, 2007 11:44 AM
To: Larry Scheer
Subject: Re: Please review Kerberos Build changes

On Mon, 30 Apr 2007 11:32:28 -0700 "Larry Scheer"
<larry.scheer@onstor.com> wrote:

> Changes made to prevent Kerberos man pages from getting into
> distribution.
> Adding kinit to distribution as requested.

I don't see the part about kinit ?

> Opened files:
>=20
> //depot/FB-DELOREAN/Makefile#6 - edit default change (text)
> //depot/FB-DELOREAN/openbsd/src/krb5-1.4.2/src/build-cross/Makefile#1
> - edit default change (text)
>
//depot/FB-DELOREAN/openbsd/src/krb5-1.4.2/src/build-cross/util/et/Makef
> ile#1 - edit default change (text)
>
//depot/FB-DELOREAN/openbsd/src/krb5-1.4.2/src/build-cross/util/send-pr/
> Makefile#1 - edit default change (text)
>=20
> Diffs:
>=20
> =3D=3D=3D=3D //depot/FB-DELOREAN/Makefile#6 -
> /home/larrys/perforce/trees/FB-DELOREAN/Makefile =3D=3D=3D=3D
> @@ -263,9 +263,12 @@
>         cd $(OPENBSD)/src/openssl-0.9.7g && $(SUDO) make install_sw \
>         INSTALLTOP=3D${DESTDIR}/usr
> =20
> +# setting INSTALL_DATA=3D: in the kerberos install disables install =
man
> pages
>  bsd-distr-extra:
>         cd $(OPENBSD)/src/krb5-1.4.2/src/build-cross && \
> -       $(SUDO) make install DESTDIR=3D${DESTDIR} CROSSDIR=3D""
> +       $(SUDO) make install DESTDIR=3D${DESTDIR} CROSSDIR=3D""
> INSTALL_DATA=3D: \
> +       INSTALL_SHLIB=3D"install -m 755"
> +       $(SUDO) mv $(DESTDIR)/usr/kerberos/kinit $(DESTDIR)/usr/bin
>         cd $(OPENBSD)/src/openssh-4.2p1/build-cross && \
>         $(SUDO) make install DESTDIR=3D${DESTDIR} CROSSDIR=3D""
>=20
> =3D=3D=3D=3D
> //depot/FB-DELOREAN/openbsd/src/krb5-1.4.2/src/build-cross/Makefile#1
> -
/home/larrys/perforce/trees/FB-DELOREAN/openbsd/src/krb5-1.4.2/src/build
> -cross/Makefile =3D=3D=3D=3D
> @@ -611,12 +611,17 @@
>         date
>         make $(MFLAGS) all
>         date
> -
> +ifdef ONSTOR_WANTS_MANPAGES
>  INSTALLMKDIRS =3D $(KRB5ROOT) $(KRB5MANROOT) $(KRB5OTHERMKDIRS) \
>                 $(ADMIN_BINDIR) $(SERVER_BINDIR) $(CLIENT_BINDIR) \
>                 $(ADMIN_MANDIR) $(SERVER_MANDIR) $(CLIENT_MANDIR) \
>                 $(FILE_MANDIR) $(KRB5_LIBDIR) $(KRB5_INCDIR) \
>                 $(KRB5_INCSUBDIRS) $(datadir) $(EXAMPLEDIR)
> +else
> +INSTALLMKDIRS =3D $(KRB5ROOT) $(KRB5OTHERMKDIRS) \
> +               $(ADMIN_BINDIR) $(SERVER_BINDIR) $(CLIENT_BINDIR) \
> +               $(KRB5_LIBDIR) $(KRB5_INCDIR) $(datadir)
> +endif
> =20
>  install-strip:
>         $(MAKE) install INSTALL_STRIP=3D-s
>=20
> =3D=3D=3D=3D
>
//depot/FB-DELOREAN/openbsd/src/krb5-1.4.2/src/build-cross/util/et/Makef
> ile#1 -
>
/home/larrys/perforce/trees/FB-DELOREAN/openbsd/src/krb5-1.4.2/src/build
> -cross/util/et/Makefile =3D=3D=3D=3D
> @@ -724,8 +724,8 @@
>  install-unix:: compile_et
>         $(INSTALL) compile_et $(DESTDIR)$(bindir)/compile_et
>         test -d $(DESTDIR)$(mydatadir) || mkdir $(DESTDIR)$(mydatadir)
> -       $(INSTALL_DATA) $(srcdir)/et_c.awk $(DESTDIR)$(mydatadir)
> -       $(INSTALL_DATA) $(srcdir)/et_h.awk $(DESTDIR)$(mydatadir)
> +       $(INSTALL_SCRIPT) $(srcdir)/et_c.awk $(DESTDIR)$(mydatadir)
> +       $(INSTALL_SCRIPT) $(srcdir)/et_h.awk $(DESTDIR)$(mydatadir)
>=20
> =3D=3D=3D=3D
>
//depot/FB-DELOREAN/openbsd/src/krb5-1.4.2/src/build-cross/util/send-pr/
> Makefile#1 -
>
/home/larrys/perforce/trees/FB-DELOREAN/openbsd/src/krb5-1.4.2/src/build
> -cross/util/send-pr/Makefile =3D=3D=3D=3D
> @@ -577,6 +577,7 @@
>  install-sid: install-sid.sh
>         sed -e 's,@ADMIN_BINDIR@,$(ADMIN_BINDIR),g'
> $(srcdir)/install-sid.sh > install-sid
> =20
> +ifdef ONSTOR_WANTS_MANPAGES
>  install:: all
>         if [ -d $(DESTDIR)$(prefix) ]; then true ; else mkdir
> $(DESTDIR)$(prefix) ; fi
>         if [ -d $(DESTDIR)$(ADMIN_BINDIR) ]; then true ; else mkdir
> $(DESTDIR)$(ADMIN_BINDIR) ; fi
> @@ -591,6 +592,14 @@
>         if [ -d $(DESTDIR)$(man1dir) ] ; then true ; else mkdir
> $(DESTDIR)$(man1dir) ; fi
>         sed -e 's/send-pr/$(sendprname)/g' $(srcdir)/send-pr.1 >
> $(DESTDIR)$(man1dir)/$(sendprname).1
>         chmod 644 $(DESTDIR)$(man1dir)/$(sendprname).1
> +else
> +install:: all
> +       if [ -d $(DESTDIR)$(prefix) ]; then true ; else mkdir
> $(DESTDIR)$(prefix) ; fi
> +       if [ -d $(DESTDIR)$(ADMIN_BINDIR) ]; then true ; else mkdir
> $(DESTDIR)$(ADMIN_BINDIR) ; fi
> +       cp send-pr $(DESTDIR)$(ADMIN_BINDIR)/$(sendprname)
> +       chmod 755 $(DESTDIR)$(ADMIN_BINDIR)/$(sendprname)
> +       if [ -d $(DESTDIR)$(datadir) ] ; then true ; else mkdir
> $(DESTDIR)$(datadir) ; fi
> +endif
> =20
>  clean::
>         rm -f install-sid send-pr send-pr.el*
