2003-05-28 Casper S. Hornstrup <chorns@users.sourceforge.net>

* Makefile: Update bootcd target.

svn path=/trunk/; revision=4792
This commit is contained in:
Casper Hornstrup 2003-05-28 19:53:53 +00:00
parent a255631bec
commit 1e2c725f58
2 changed files with 9 additions and 6 deletions

View file

@ -1,3 +1,7 @@
2003-05-28 Casper S. Hornstrup <chorns@users.sourceforge.net>
* Makefile: Update bootcd target.
2003-05-28 Casper S. Hornstrup <chorns@users.sourceforge.net> 2003-05-28 Casper S. Hornstrup <chorns@users.sourceforge.net>
* subsys/system/usetup/progress.c (ProgressNextStep): Check if NewPos * subsys/system/usetup/progress.c (ProgressNextStep): Check if NewPos

View file

@ -148,17 +148,16 @@ dist: $(TOOLS_PATH)/rcopy$(EXE_POSTFIX) dist_clean dist_dirs \
bootcd_directory_layout: bootcd_directory_layout:
$(RMKDIR) $(BOOTCD_DIR) $(RMKDIR) $(BOOTCD_DIR)
$(RMKDIR) $(BOOTCD_DIR)/bootdisk $(RMKDIR) $(BOOTCD_DIR)/bootdisk
$(RMKDIR) $(BOOTCD_DIR)/install $(RMKDIR) $(BOOTCD_DIR)/loader
$(RMKDIR) $(BOOTCD_DIR)/reactos $(RMKDIR) $(BOOTCD_DIR)/reactos
$(RMKDIR) $(BOOTCD_DIR)/reactos/system32 $(RMKDIR) $(BOOTCD_DIR)/reactos/system32
$(RMKDIR) $(BOOTCD_DIR)/loader
bootcd_bootstrap_files: $(COMPONENTS:%=%_bootcd) $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) \ bootcd_bootstrap_files: $(COMPONENTS:%=%_bootcd) $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) \
$(LIB_STATIC:%=%_bootcd) $(LIB_FSLIB:%=%_bootcd) $(DLLS:%=%_bootcd) $(KERNEL_DRIVERS:%=%_bootcd) \ $(LIB_STATIC:%=%_bootcd) $(LIB_FSLIB:%=%_bootcd) $(DLLS:%=%_bootcd) $(KERNEL_DRIVERS:%=%_bootcd) \
$(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd) $(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd)
bootcd: all bootcd_directory_layout bootcd_bootstrap_files bootcd: all bootcd_directory_layout bootcd_bootstrap_files
$(MAKE) install INSTALL_DIR=$(BOOTCD_DIR)/install INSTALL_SYMBOLS=no BOOTCD_INSTALL=yes $(MAKE) install INSTALL_DIR=$(BOOTCD_DIR)/reactos INSTALL_SYMBOLS=no BOOTCD_INSTALL=yes
.PHONY: all depends implib clean clean_before install dist bootcd_directory_layout \ .PHONY: all depends implib clean clean_before install dist bootcd_directory_layout \
bootcd_bootstrap_files bootcd bootcd_bootstrap_files bootcd
@ -772,8 +771,8 @@ install_dirs:
$(RMKDIR) $(INSTALL_DIR) $(RMKDIR) $(INSTALL_DIR)
install_before: install_before:
# $(CP) bootdata/autorun.inf $(INSTALL_DIR)/../autorun.inf # $(RLINE) bootdata/autorun.inf $(INSTALL_DIR)/../autorun.inf
$(CP) bootdata/readme.txt $(INSTALL_DIR)/../readme.txt $(RLINE) bootdata/readme.txt $(INSTALL_DIR)/../readme.txt
$(RLINE) bootdata/hivecls.inf $(INSTALL_DIR)/hivecls.inf $(RLINE) bootdata/hivecls.inf $(INSTALL_DIR)/hivecls.inf
$(RLINE) bootdata/hivedef.inf $(INSTALL_DIR)/hivedef.inf $(RLINE) bootdata/hivedef.inf $(INSTALL_DIR)/hivedef.inf
$(RLINE) bootdata/hivesft.inf $(INSTALL_DIR)/hivesft.inf $(RLINE) bootdata/hivesft.inf $(INSTALL_DIR)/hivesft.inf
@ -782,7 +781,7 @@ install_before:
$(CP) media/fonts $(INSTALL_DIR) $(CP) media/fonts $(INSTALL_DIR)
$(CP) media/nls $(INSTALL_DIR) $(CP) media/nls $(INSTALL_DIR)
else # BOOTCD_INSTALL else # !BOOTCD_INSTALL
install_dirs: install_dirs:
$(RMKDIR) $(INSTALL_DIR) $(RMKDIR) $(INSTALL_DIR)