--- Makefile.old	2007-06-09 14:40:39.000000000 -0400
+++ Makefile	2007-09-18 16:36:57.000000000 -0400
@@ -9,11 +9,10 @@
 	updmap-sys --enable Map=culmus.map
 
 pkginstall: tfms
-	mkdir -p $(TEXMFDIR)/dvips/culmus/ \
-		$(TEXMFDIR)/fonts/afm/public/culmus/ \
+	mkdir -p $(TEXMFDIR)/fonts/afm/public/culmus/ \
 		$(TEXMFDIR)/fonts/type1/public/culmus/ \
 		$(TEXMFDIR)/fonts/enc/dvips/culmus/ \
-		$(TEXMFDIR)/fonts/map/dvips/ \
+		$(TEXMFDIR)/fonts/map/dvips/culmus \
 		$(TEXMFDIR)/fonts/tfm/public/culmus/ \
 		$(TEXMFDIR)/fonts/vf/public/culmus/ \
 		$(TEXMFDIR)/tex/latex/culmus/ \
@@ -21,10 +20,10 @@
 #this needs to be a 'cp' as 'ln -s' will cause the files not to be 
 # found by tex under certain systems. We only move the neccessary files.
 	cp -p $(CULMUSDIR)/*.afm $(TEXMFDIR)/fonts/afm/public/culmus/
-	cp -p $(CULMUSDIR)/*.pfa $(TEXMFDIR)/fonts/type1/public/culmus/
+	cp -p *.pfa $(TEXMFDIR)/fonts/type1/public/culmus/
 	
 	cp -p he8.enc $(TEXMFDIR)/fonts/enc/dvips/culmus/he8.enc
-	cp -p culmus.map $(TEXMFDIR)/fonts/map/dvips/culmus.map
+	cp -p culmus.map $(TEXMFDIR)/fonts/map/dvips/culmus/culmus.map
 	cp -p *.tfm $(TEXMFDIR)/fonts/tfm/public/culmus/
 	cp -p *.vf  $(TEXMFDIR)/fonts/vf/public/culmus/
 	cp -p culmus.sty $(TEXMFDIR)/tex/latex/culmus/
@@ -41,7 +40,7 @@
 	rm -rf $(TEXMFDIR)/fonts/afm/public/culmus
 	rm -rf $(TEXMFDIR)/fonts/type1/public/culmus
 	rm $(TEXMFDIR)/fonts/enc/dvips/culmus/he8.enc
-	rm $(TEXMFDIR)/fonts/map/dvips/culmus.map
+	rm $(TEXMFDIR)/fonts/map/dvips/culmus/culmus.map
 	rm $(TEXMFDIR)/fonts/tfm/public/culmus/*.tfm
 	rm $(TEXMFDIR)/fonts/vf/public/culmus/*.vf
 	rm $(TEXMFDIR)/tex/latex/culmus/culmus.sty