diff -urN dcmtk-3.5.4/dcmdata/apps/Makefile.in dcmtk-3.5.4-patched/dcmdata/apps/Makefile.in
--- dcmtk-3.5.4/dcmdata/apps/Makefile.in	2005-10-25 15:01:02.000000000 +0200
+++ dcmtk-3.5.4-patched/dcmdata/apps/Makefile.in	2005-12-23 13:17:49.000000000 +0100
@@ -73,13 +73,18 @@
 	done
 
 install-support:
-	$(configdir)/mkinstalldirs $(libdir)
+	if [ "x$(prefix)" = "x" ] ; then \
+	    SUPPORTPATH="$(libdir)" ;\
+	else \
+	    SUPPORTPATH="$(datadir)" ;\
+	fi ; \
+	$(configdir)/mkinstalldirs $$SUPPORTPATH ;\
 	for file in $(support_lib); do \
-		$(INSTALL_DATA) $$file $(libdir) ;\
-	done
-	$(configdir)/mkinstalldirs $(datadir)
+	    $(INSTALL_DATA) $$file $$SUPPORTPATH ;\
+	done ;\
+	$(configdir)/mkinstalldirs $$SUPPORTPATH ;\
 	for file in $(support_data); do \
-		$(INSTALL_DATA) $$file $(datadir) ;\
+		$(INSTALL_DATA) $$file $$SUPPORTPATH ;\
 	done
 
 clean:
diff -urN dcmtk-3.5.4/dcmdata/libsrc/Makefile.in dcmtk-3.5.4-patched/dcmdata/libsrc/Makefile.in
--- dcmtk-3.5.4/dcmdata/libsrc/Makefile.in	2005-12-09 16:04:37.000000000 +0100
+++ dcmtk-3.5.4-patched/dcmdata/libsrc/Makefile.in	2005-12-23 13:29:08.000000000 +0100
@@ -56,12 +56,17 @@
 	$(INSTALL_DATA) $(library) $(libdir)/$(library)
 
 install-support: $(DICTFILE) $(PRIVDICTFILE)
-	$(configdir)/mkinstalldirs $(libdir)
+	if [ "x$(prefix)" = "x" ] ; then \
+	    DICTPATH="$(libdir)" ; \
+	else \
+	    DICTPATH="$(datadir)" ; \
+	fi ; \
+	$(configdir)/mkinstalldirs $$DICTPATH ; \
 	if [ "x$(INSTALL_PRIVATE_DICTIONARY)" = "xYES" ] ; then \
 		cat $(DICTFILE) $(PRIVDICTFILE) >dicom.tmp ; \
-		$(INSTALL_DATA) dicom.tmp $(libdir)/dicom.dic ; \
+		$(INSTALL_DATA) dicom.tmp $$DICTPATH/dicom.dic ; \
 	else \
-		$(INSTALL_DATA) $(DICTFILE) $(libdir)/dicom.dic ; \
+		$(INSTALL_DATA) $(DICTFILE) $$DICTPATH/dicom.dic ; \
 	fi
 
 
diff -urN dcmtk-3.5.4/dcmsr/apps/Makefile.in dcmtk-3.5.4-patched/dcmsr/apps/Makefile.in
--- dcmtk-3.5.4/dcmsr/apps/Makefile.in	2004-05-05 15:37:17.000000000 +0200
+++ dcmtk-3.5.4-patched/dcmsr/apps/Makefile.in	2005-12-23 13:19:59.000000000 +0100
@@ -49,9 +49,14 @@
 	done
 
 install-support:
-	$(configdir)/mkinstalldirs $(libdir)
+	if [ "x$(prefix)" = "x" ] ; then \
+	    SUPPORTPATH="$(libdir)" ;\
+	else \
+	    SUPPORTPATH="$(datadir)" ;\
+	fi ; \
+	$(configdir)/mkinstalldirs $$SUPPORTPATH ;\
 	for file in $(support); do \
-		$(INSTALL_DATA) $$file $(libdir) ;\
+		$(INSTALL_DATA) $$file $$SUPPORTPATH ;\
 	done
 
 clean: