x86: add grub2 iso support
[openwrt.git] / package / grub / patches / 040-automake-compat.patch
1 --- a/stage1/Makefile.am
2 +++ b/stage1/Makefile.am
3 @@ -1,7 +1,7 @@
4  pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
5 -nodist_pkglib_DATA = stage1
6 +nodist_pkgdata_DATA = stage1
7  
8 -CLEANFILES = $(nodist_pkglib_DATA)
9 +CLEANFILES = $(nodist_pkgdata_DATA)
10  
11  # We can't use builtins or standard includes.
12  AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
13 --- a/stage2/Makefile.am
14 +++ b/stage2/Makefile.am
15 @@ -32,7 +32,7 @@ pkglibdir = $(libdir)/$(PACKAGE)/$(host_
16  EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
17  
18  if DISKLESS_SUPPORT
19 -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
20 +pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
21         ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
22         reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
23         nbgrub pxegrub
24 @@ -43,7 +43,7 @@ noinst_PROGRAMS = pre_stage2.exec start.
25         reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
26         xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
27  else
28 -pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
29 +pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
30         ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
31         reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
32  noinst_DATA = pre_stage2 start start_eltorito
33 @@ -112,7 +112,7 @@ else
34  BUILT_SOURCES = stage2_size.h
35  endif
36  
37 -CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
38 +CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES)
39  
40  stage2_size.h: pre_stage2
41         -rm -f stage2_size.h