source: trunk/package/grub/patches/040-automake-compat.patch @ 31201

Last change on this file since 31201 was 31201, checked in by jow, 4 years ago

[package] grub: fix build with automake v1.11.3 (#11228)

File size: 1.5 KB
  • stage1/Makefile.am

    a b  
    11pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) 
    2 nodist_pkglib_DATA = stage1 
     2nodist_pkgdata_DATA = stage1 
    33 
    4 CLEANFILES = $(nodist_pkglib_DATA) 
     4CLEANFILES = $(nodist_pkgdata_DATA) 
    55 
    66# We can't use builtins or standard includes. 
    77AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc 
  • stage2/Makefile.am

    a b pkglibdir = $(libdir)/$(PACKAGE)/$(host_ 
    3232EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec 
    3333 
    3434if DISKLESS_SUPPORT 
    35 pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ 
     35pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ 
    3636        ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ 
    3737        reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \ 
    3838        nbgrub pxegrub 
    noinst_PROGRAMS = pre_stage2.exec start. 
    4343        reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \ 
    4444        xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec 
    4545else 
    46 pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ 
     46pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \ 
    4747        ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \ 
    4848        reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 
    4949noinst_DATA = pre_stage2 start start_eltorito 
    else 
    112112BUILT_SOURCES = stage2_size.h 
    113113endif 
    114114 
    115 CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES) 
     115CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES) 
    116116 
    117117stage2_size.h: pre_stage2 
    118118        -rm -f stage2_size.h 
Note: See TracBrowser for help on using the repository browser.