On Thu, Apr 20, 2006 at 05:21:56PM -0700, Kris Jurka wrote: > Steve Langasek wrote:
> >More generally, openmotif needs to be updated to use /usr instead of > >/usr/X11R6; this was already a bug because openmotif does not appear to use > >imake, and /usr/X11R6 is reserved for packages that are either part of > >X11R6 > >or build using imake. > Is that as simple to do as this patch? > The patch for _XGetpwnam is no longer needed because the modular X uses > the original API. > Other than that it's basically a s/X11R6\///. It adds references to > /usr/X11R6 to the configure command because it uses things like > libxp-dev. Are these going to move out of X11R6? Yes, a fixed libxp-dev that installs to /usr/lib,/usr/include is waiting in the NEW queue. > diff -c orig/openmotif-2.2.3/debian/rules openmotif-2.2.3/debian/rules > *** orig/openmotif-2.2.3/debian/rules 2006-04-20 16:44:07.000000000 -0700 > --- openmotif-2.2.3/debian/rules 2006-04-20 17:03:29.000000000 -0700 > *************** > *** 37,44 **** > (cd $(WORK)/$(DIR); set -ex; \ > CFLAGS="-g -O2 -fno-strict-aliasing" \ > ./configure \ > ! --prefix=/usr/X11R6 \ > ! --mandir=/usr/X11R6/man; \ > make) > # sh $(HERE)/debian/fix-libtool $(WORK); \ > # make; \ > --- 37,45 ---- > (cd $(WORK)/$(DIR); set -ex; \ > CFLAGS="-g -O2 -fno-strict-aliasing" \ > ./configure \ > ! --prefix=/usr \ > ! --x-includes=/usr/X11R6/include \ > ! --x-libraries=/usr/X11R6/lib; \ > make) > # sh $(HERE)/debian/fix-libtool $(WORK); \ > # make; \ Which means this part of the patch should just be --prefix=/usr BTW, please use unified diff format (diff -u) for patches. > --- 65,80 ---- > cd $(WORK)/$(DIR)/$$dir; \ > make DESTDIR=$(DEST) install; \ > done > ! # cp -a $(WORK)/$(DIR)/doc/man $(DEST)/usr/man > ! # rm -f $(DEST)/usr/man/man*/Makefile* /usr/man isn't the right directory, this should be /usr/share/man on an FHS-compliant system. But these lines seem to be commented out anyway... Otherwise, the patch looks good to me. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
signature.asc
Description: Digital signature
