diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:42:59 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:42:59 +0000 |
| commit | 3f3a04b4f57b00141620da774ff9288685034c16 (patch) | |
| tree | a5bee03d031577d9ba86e87b2f3a7f3178cd8b0f /desktop/zipintro/makefile.mk | |
| parent | b82aed8e7f02baa2fd8e97ba4ec36833d0a035f9 (diff) | |
more merge fixes
Diffstat (limited to 'desktop/zipintro/makefile.mk')
| -rwxr-xr-x | desktop/zipintro/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index cdc547fcc5c7..83a91ad3c2ba 100755 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -67,7 +67,7 @@ ZIP3DEPS=$(ZIP3LIST) .INCLUDE : target.mk ALLTAR : \ - $(COMMONBIN)$/brand$/intro.zip \ + $(COMMONBIN)$/intro.zip \ $(COMMONBIN)$/brand_dev$/intro.zip \ $(COMMONBIN)$/shell/shell.zip @@ -75,7 +75,7 @@ $(COMMONBIN)$/brand_dev$/intro.zip : $(COMMONBIN)$/brand_dev.zip @@-$(MKDIR) $(@:d) @$(COPY) $< $@ -$(COMMONBIN)$/brand$/intro.zip : $(COMMONBIN)$/brand.zip +$(COMMONBIN)$/intro.zip : $(COMMONBIN)$/brand.zip @@-$(MKDIR) $(@:d) @$(COPY) $< $@ |