--- makefile.in
+++ makefile.in
@@ -3,6 +3,7 @@
 LDFLAGS	= @LDFLAGS@
 LIBS  = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@
 prefix = @prefix@
+export infodir = @infodir@
 BINDIR        = $(prefix)/bin
 LIBLOC        = $(prefix)/lib/logo
 MAKE = @MAKE@
--- docs/makefile
+++ docs/makefile
@@ -1,6 +1,14 @@
 BUILDIR	      = `pwd`
+ifdef infodir
+INFODIR	      = $(infodir)
+else
 INFODIR	      = $(prefix)/info
-DOCSDIR	      = $(LIBLOC)/docs
+endif
+ifdef PF
+DOCSDIR	      = $(prefix)/share/doc/$(PF)
+else
+DOCSDIR	      = $(prefix)/share/doc/logo
+endif
 HTMLDIR	      = $(DOCSDIR)/html
 
 all: usermanual.ps usermanual.pdf html/usermanual_1.html ucblogo.info