AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:onstor-exch02.onstor.net
NSV:
SSH:
R:<larry.scheer@onstor.com>
MAID:1
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
RMID:#imap/andys@onstor.net@onstor-exch02.onstor.net/INBOX	0	BB375AF679D4A34E9CA8DFA650E2B04E0221577C@onstor-exch02.onstor.net
X-Sylpheed-End-Special-Headers: 1
Date: Mon, 30 Apr 2007 13:36:25 -0700
From: Andrew Sharp <andy.sharp@onstor.com>
To: "Larry Scheer" <larry.scheer@onstor.com>
Subject: Re: Please review Kerberos Build changes
Message-ID: <20070430133625.0546a143@ripper.onstor.net>
In-Reply-To: <BB375AF679D4A34E9CA8DFA650E2B04E0221577C@onstor-exch02.onstor.net>
References: <20070430114418.218a37c7@ripper.onstor.net>
	<BB375AF679D4A34E9CA8DFA650E2B04E0221577C@onstor-exch02.onstor.net>
Organization: Onstor
X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.8.20; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

OK.

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

> 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=: in the kerberos install disables install
> > man
> pages
> 268c269,271
> <       $(SUDO) make install DESTDIR=${DESTDIR} CROSSDIR=""
> ---
> >       $(SUDO) make install DESTDIR=${DESTDIR} CROSSDIR=""
> INSTALL_DATA=: \
> >       INSTALL_SHLIB="install -m 755"
> >       $(SUDO) mv $(DESTDIR)/usr/kerberos/bin/kinit
> > $(DESTDIR)/usr/bin
> 
> -----Original Message-----
> From: Andy Sharp 
> 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:
> > 
> > //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)
> > 
> > Diffs:
> > 
> > ==== //depot/FB-DELOREAN/Makefile#6 -
> > /home/larrys/perforce/trees/FB-DELOREAN/Makefile ====
> > @@ -263,9 +263,12 @@
> >         cd $(OPENBSD)/src/openssl-0.9.7g && $(SUDO) make install_sw
> > \ INSTALLTOP=${DESTDIR}/usr
> >  
> > +# setting INSTALL_DATA=: 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=${DESTDIR} CROSSDIR=""
> > +       $(SUDO) make install DESTDIR=${DESTDIR} CROSSDIR=""
> > INSTALL_DATA=: \
> > +       INSTALL_SHLIB="install -m 755"
> > +       $(SUDO) mv $(DESTDIR)/usr/kerberos/kinit $(DESTDIR)/usr/bin
> >         cd $(OPENBSD)/src/openssh-4.2p1/build-cross && \
> >         $(SUDO) make install DESTDIR=${DESTDIR} CROSSDIR=""
> > 
> > ====
> > //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 ====
> > @@ -611,12 +611,17 @@
> >         date
> >         make $(MFLAGS) all
> >         date
> > -
> > +ifdef ONSTOR_WANTS_MANPAGES
> >  INSTALLMKDIRS = $(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 = $(KRB5ROOT) $(KRB5OTHERMKDIRS) \
> > +               $(ADMIN_BINDIR) $(SERVER_BINDIR) $(CLIENT_BINDIR) \
> > +               $(KRB5_LIBDIR) $(KRB5_INCDIR) $(datadir)
> > +endif
> >  
> >  install-strip:
> >         $(MAKE) install INSTALL_STRIP=-s
> > 
> > ====
> >
> //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 ====
> > @@ -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)
> > 
> > ====
> >
> //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 ====
> > @@ -577,6 +577,7 @@
> >  install-sid: install-sid.sh
> >         sed -e 's,@ADMIN_BINDIR@,$(ADMIN_BINDIR),g'
> > $(srcdir)/install-sid.sh > install-sid
> >  
> > +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
> >  
> >  clean::
> >         rm -f install-sid send-pr send-pr.el*
