← Back to branch summary

~gilir/debian-cd/ubuntu

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Colin Watson
  • Date: 2011-06-30 11:52:16 UTC
  • Revision ID: cjwatson@canonical.com-20110630115216-u835mn6cd8u4woxq
Copy manifest-remove to the image if it exists.  Thanks to Stéphane Graber for spotting this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1093
1093
        done
1094
1094
ifeq ($(CDIMAGE_LIVE),1)
1095
1095
        -cp -a $(LIVEIMAGES)/$(FULLARCH).manifest $(OUT)/$(call CDBASE,$$n).manifest
1096
 
        -cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-desktop $(OUT)/$(call CDBASE,$$n).manifest-desktop
 
1096
        -if [ -e $(LIVEIMAGES)/$(FULLARCH).manifest-remove ]; then \
 
1097
                cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-remove $(OUT)/$(call CDBASE,$$n).manifest-remove; \
 
1098
        else \
 
1099
                cp -a $(LIVEIMAGES)/$(FULLARCH).manifest-desktop $(OUT)/$(call CDBASE,$$n).manifest-desktop; \
 
1100
        fi
1097
1101
endif
1098
1102
 
1099
1103
bin-preinstalled_images: ok $(OUT)
1113
1117
                $(OUT)/$(call CDBASE,1).raw; \
1114
1118
        fi
1115
1119
        -cp -a $(PREINSTALLEDIMAGES)/$(FULLARCH).manifest $(OUT)/$(call CDBASE,$$n).manifest
1116
 
        -cp -a $(PREINSTALLEDIMAGES)/$(FULLARCH).manifest-desktop $(OUT)/$(call CDBASE,$$n).manifest-desktop
 
1120
        -if [ -e $(PREINSTALLEDIMAGES)/$(FULLARCH).manifest-remove ]; then \
 
1121
                cp -a $(PREINSTALLEDIMAGES)/$(FULLARCH).manifest-remove $(OUT)/$(call CDBASE,$$n).manifest-remove; \
 
1122
        else \
 
1123
                cp -a $(PREINSTALLEDIMAGES)/$(FULLARCH).manifest-desktop $(OUT)/$(call CDBASE,$$n).manifest-desktop; \
 
1124
        fi
1117
1125
 
1118
1126
# FIXME: This only works with CD1, and not with addon CDs.
1119
1127
bin-compress_images: ok $(OUT)