On Fri, 18 Jun 2004, Thomas Dickey wrote:
> On Fri, 18 Jun 2004, Igor Pechtchanski wrote:
> > On Fri, 18 Jun 2004, Thomas Dickey wrote:
> > > On Fri, 18 Jun 2004, Igor Pechtchanski wrote:
> > > > On Fri, 18 Jun 2004, Thomas Dickey wrote:
> > > >
> > > > > Before I reorder $PATH, I generally take a look for conflicts -
> > > > > http://invisible-island.net/conflict/
> > > >
> > > > Hmm, useful and builds OOTB... Have you considered making it a Cygwin
> > > > package?
> > >
> > > not really (I don't do much with packaging, but do offer advice to
> > > people making packages from the things I work on).
> >
> > Ok, a couple of stumbles so far:
> > - The tarball is named "conflict.tar.gz" -- it would be easier if it were
> > named "conflict-20040327.tar.gz"... Not a biggie, though.
>
> The webpage links to conflict.tar.gz (so I don't have to edit it).
> But the ftp area has both names.
Great, got it.
> > - The "make install" rule should install into ${DESTDIR}${exec_prefix},
> > not ${exec_prefix} (same goes for manpages, etc). I can do a quick and
> > dirty hack, but what do you think would be the "right" way?
>
> I guess I should add $DESTDIR to the makefile.in (thanks for the
> reminder).
>
> > One last thing: are you willing to accept patches?
> > Igor
>
> yes
In light of the above, how about the attached patch for $DESTDIR? ;-)
One more thing: "make check" doesn't work when built outside of the source
directory (the build itself is fine). I think changing "./run_test.sh" to
"${srcdir}/run_test.sh" should fix it, but I'm not sure, so I'll leave it
up to you. Also, when testing, a file called "conflict" is blindly
removed and created in /tmp, and the test itself doesn't seem to work
under Cygwin (i.e., reports no conflicts). Could the latter have
something to do with the .exe extension (just a guess)? I'll check later.
Igor
==============================================================================
ChangeLog (if needed):
2004-06-18 Igor Pechtchanski <[EMAIL PROTECTED]>
* makefile.in (install): Add $(DESTDIR) prefix.
(installdirs,uninstall): Ditto.
--
http://cs.nyu.edu/~pechtcha/
|\ _,,,---,,_ [EMAIL PROTECTED]
ZZZzz /,`.-'`' -. ;-;;,_ [EMAIL PROTECTED]
|,4- ) )-,_. ,\ ( `'-' Igor Pechtchanski, Ph.D.
'---''(_/--' `-'\_) fL a.k.a JaguaR-R-R-r-r-r-.-.-. Meow!
"I have since come to realize that being between your mentor and his route
to the bathroom is a major career booster." -- Patrick Naughton
diff -urN conflict-20040327-orig/makefile.in conflict-20040327/makefile.in
--- conflict-20040327-orig/makefile.in 2004-03-27 19:53:18.000000000 -0500
+++ conflict-20040327/makefile.in 2004-06-18 14:58:27.904150400 -0400
@@ -60,14 +60,14 @@
$(OBJ) : conflict.h
install: all installdirs
- $(INSTALL_PROGRAM) $(PROG) $(bindir)/$(PROG)
- $(INSTALL_DATA) $(srcdir)/$(THIS).1 $(mandir)/$(THIS).$(manext)
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(PROG)
+ $(INSTALL_DATA) $(srcdir)/$(THIS).1 $(DESTDIR)$(mandir)/$(THIS).$(manext)
installdirs:
- $(SHELL) ${srcdir}/mkdirs.sh $(bindir) $(mandir)
+ $(SHELL) ${srcdir}/mkdirs.sh $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
uninstall:
- rm -f $(bindir)/$(PROG) $(mandir)/$(THIS).$(manext)
+ rm -f $(DESTDIR)$(bindir)/$(PROG) $(DESTDIR)$(mandir)/$(THIS).$(manext)
mostlyclean:
rm -f *$o core *~ *.BAK