On Thu, Apr 30, 2009 at 03:56, Mike Frysinger <vapier.adi@xxxxxxxxx> wrote: > On Wed, Apr 29, 2009 at 21:48, Kay Sievers wrote: >> On Wed, 2009-04-29 at 14:56 -0700, Greg KH wrote: >>> If youreally want it, you can grab it from the git tree, or wait a day >>> or so for me to implement Mike's changes he so nicely sent me, so I can >>> do a new release. >> >> How about this? It substitutes the script and the man page with the >> given --datadir=. > > i had pretty much the same changes locally, but i was going to let the > discussion on data/multiple paths finish first. at any rate, comments > below ... > >> --- a/Makefile.am >> +++ b/Makefile.am >> >> +update-usbids.sh: update-usbids.sh.in >> +lsusb.8: lsusb.8.in > > need $(srcdir)/ in front of the dependency > >> + sed 's|@usbids@|$(datadir)/usb.ids|' $< >$@ >> + sed 's|@usbids@|$(datadir)/usb.ids|' $< >$@ > > should use the 'g' option to sed > > in theory you should use AC_PROG_SED in configure.ac and then $(SED) > in the Makefile.am Fine, if that works. > $(datadir) too should die ... $(datarootdir) is the right variable name Then you want to specify man pages separately? I wouldn't do that. >> clean-local: >> rm -f usb.ids.gz >> + rm -f lsusb.8 >> + rm -f update-usbids.sh > > after Greg merges the patches i sent for usb.ids.gz, it should be > clear that clean-local should die and you should update DISTCLEANFILES Sure, no problem. >> --- a/configure.ac >> +++ b/configure.ac >> >> + datadir: ${datadir} > > we have datarootdir now, so no point in adding datadir Only if you require to set the man dir. Kay -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html