fix paths

yast · Oct 7, 2013 · 1bd1e23 · 1bd1e23
1 parent db324ba
commit 1bd1e23
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/build_tools/Makefile.am.toplevel b/build_tools/Makefile.am.toplevel
@@ -19,8 +19,9 @@ HAS_YAST_LICENSE	= $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
 # do we do Makefile.am for devtools? It is a little special...
 IS_DEVTOOLS		= $(findstring yast2-devtools,$(RPMNAME))
 
-DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-LEGALESE_DIR		= $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
+DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir),$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
+LEGALESE_DIR		= $(if
+$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/build_tools/copyright/gpl)
 
 COPYRIGHT_files_gpl	= README COPYING
 
@@ -34,9 +35,9 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
 # where devtools install m4 snippets
 # argh, executed literally
 #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./build_tools; then echo ./build_tools; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
 
-Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
+Makefile.am.common: $(DEVTOOLS_DIR)/build_tools/Makefile.am.common
 	cmp -s $< $@ || cp -f $< $@
 
 # create bzip2ed tar and make some sanity checks