← Back to branch summary

~xubuntu-dev/debian-cd/xubuntu-base

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Loic Minier
  • Date: 2009-04-03 13:39:21 UTC
  • mto: This revision was merged to the branch mainline in revision 1388.
  • Revision ID: lool@antimony-20090403133921-708ffyoc6os6kokk
replace CDIMAGE_VFAT= with IMAGE_FORMAT= (either vfat or iso)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
999
999
                opts=`cat $(BDIR)/$$n.mkisofs_opts`; \
1000
1000
                volid=`cat $(BDIR)/$$n.volid`; \
1001
1001
                rm -f $(OUT)/$(call CDBASE,$$n).raw; \
1002
 
                if [ "$(CDIMAGE_VFAT)" = "1" ]; then \
 
1002
                if [ "$(IMAGE_FORMAT)" = "vfat" ]; then \
1003
1003
                        cp -a boot$$n/* CD$$n; \
1004
1004
                        $(make_vfat_img) -d CD$$n \
1005
1005
                         -o $(OUT)/$(call CDBASE,$$n).raw; \
1006
 
                else \
 
1006
                elif [ "$(IMAGE_FORMAT)" = "iso" ]; then \
1007
1007
                if [ "$(DOJIGDO)" = "0" ]; then \
1008
1008
                        $(verbose) $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
1009
1009
                          -o $(OUT)/$(call CDBASE,$$n).raw $$opts CD$$n; \
1105
1105
        set -e; cd $(BDIR); opts=`cat $(CD).mkisofs_opts`; \
1106
1106
         volid=`cat $(CD).volid`; \
1107
1107
         rm -f $(OUT)/$(call CDBASE,$(CD)).raw; \
1108
 
         if [ "$(CDIMAGE_VFAT)" = "1" ]; then
 
1108
         if [ "$(IMAGE_FORMAT)" = "vfat" ]; then \
1109
1109
         cp -a boot$(CD)/* CD$(CD); \
1110
1110
         $(make_vfat_img) -d CD$(CD) -o $(OUT)/$(call CDBASE,$(CD)).raw; \
1111
 
         else \
 
1111
         elif [ "$(IMAGE_FORMAT)" = "iso" ]; then \
1112
1112
         $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
1113
1113
          -o $(OUT)/$(call CDBASE,$(CD)).raw $$opts CD$(CD); \
1114
1114
         fi; \