X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=Makefile.am;h=6e4c6d1bc885af6af8657de9b43baeaa9e5c228a;hb=d02fa05385c5bc77f4faafd2117bdba699e15cbf;hp=3e1b74f91415accc9c3bc13dc9afcd975d99710e;hpb=f53079fadcadb1eeef45e1e6d254801d984d6068;p=yaz-moved-to-github.git

diff --git a/Makefile.am b/Makefile.am
index 3e1b74f..6e4c6d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,20 @@
-## Copyright (C) 1994-2004, Index Data
-## All rights reserved.
-## $Id: Makefile.am,v 1.29 2004-10-03 22:34:07 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1994-2005, Index Data, All rights reserved.
+## $Id: Makefile.am,v 1.32 2006-03-30 16:30:25 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign 
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src include util test client ztest zoom doc etc
 
 aclocaldir=$(datadir)/aclocal
 
-aclocal_DATA = yaz.m4
+aclocal_DATA = m4/yaz.m4
 
 SPEC_FILE=$(PACKAGE).spec
 EXTRA_DIST=$(SPEC_FILE) README LICENSE NEWS TODO windows.txt \
-	yaz-config.in yaz.m4 buildconf.sh Doxyfile.in
+	yaz-config.in m4/yaz.m4 buildconf.sh Doxyfile.in
 
 dist-hook:
 	mkdir $(distdir)/win
@@ -25,6 +27,3 @@ dist-hook:
 	cp $(srcdir)/debian/compat $(distdir)/debian
 	cp $(srcdir)/debian/*.install $(distdir)/debian
 
-rpm: $(PACKAGE)-$(VERSION).tar.gz
-	cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES
-	rpm -ba $(SPEC_FILE)