--- configure.in.orig	Fri Nov 19 20:36:44 1999
+++ configure.in	Sun Dec  5 12:46:04 1999
@@ -62,17 +62,17 @@
 
 dnl Local setup
 dnl Is there a better way of doing docs?
-GPHOTO_EXPAND_DIR(DOCDIR, "$datadir/gphoto/doc")
+GPHOTO_EXPAND_DIR(DOCDIR, "$datadir/doc/gphoto")
 AC_DEFINE_UNQUOTED(DOCDIR, "$DOCDIR")
 
 dnl Or gallery themes?
 GPHOTO_EXPAND_DIR(GALLERYDIR, "$datadir/gphoto/gallery")
 AC_DEFINE_UNQUOTED(GALLERYDIR, "$GALLERYDIR")
 
-driversdir='${pkglibdir}'
+driversdir='${libdir}/gphoto/drivers'
 AC_SUBST(driversdir)
 
-gallerydir='${pkgdatadir}/gallery'
+gallerydir='${datadir}/gphoto/gallery'
 AC_SUBST(gallerydir)
 
 AC_OUTPUT(Makefile \