[AD] Makefile fix

[ Thread Index | Date Index | More lists.liballeg.org/allegro-developers Archives ]


This patches fixes an issue where the Windows port of Allegro would refuse to install because the directories already exist.


Index: makefile.all
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.all,v
retrieving revision 1.44
diff -u -r1.44 makefile.all
--- makefile.all	28 Jan 2004 12:53:55 -0000	1.44
+++ makefile.all	5 May 2004 05:03:07 -0000
@@ -262,73 +262,73 @@
 ifdef UNIX_TOOLS
 
 $(INSTALLDIR_U)/$(LIBDIR_U):
-	mkdir $(MKDIR_OPTS) $(INSTALLDIR_U)/$(LIBDIR_U)
+	mkdir -p $(MKDIR_OPTS) $(INSTALLDIR_U)/$(LIBDIR_U)
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform/%.h: include/allegro/platform/%.h $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform
 	cp $< $@
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform: $(INSTALLDIR_U)/$(INCDIR_U)/allegro 
-	mkdir $(MKDIR_OPTS) $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform
+	mkdir -p $(MKDIR_OPTS) $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/%.h: include/allegro/internal/%.h $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal
 	cp $< $@
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal: $(INSTALLDIR_U)/$(INCDIR_U)/allegro
-	mkdir $(MKDIR_OPTS) $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal
+	mkdir -p $(MKDIR_OPTS) $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/%.inl: include/allegro/inline/%.inl $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline
 	cp $< $@
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline: $(INSTALLDIR_U)/$(INCDIR_U)/allegro
-	mkdir $(MKDIR_OPTS) $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline
+	mkdir -p $(MKDIR_OPTS) $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/%.h: include/allegro/%.h $(INSTALLDIR_U)/$(INCDIR_U)/allegro
 	cp $< $@
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro: $(INSTALLDIR_U)/$(INCDIR_U)
-	mkdir $(MKDIR_OPTS) $(INSTALLDIR_U)/$(INCDIR_U)/allegro 
+	mkdir -p $(MKDIR_OPTS) $(INSTALLDIR_U)/$(INCDIR_U)/allegro 
 
 $(INSTALLDIR_U)/$(INCDIR_U)/%.h: include/%.h $(INSTALLDIR_U)/$(INCDIR_U)
 	cp $< $@
 
 $(INSTALLDIR_U)/$(INCDIR_U):
-	mkdir $(MKDIR_OPTS) $(INSTALLDIR_U)/$(INCDIR_U)
+	mkdir -p $(MKDIR_OPTS) $(INSTALLDIR_U)/$(INCDIR_U)
 
 else
 
 $(INSTALLDIR_U)/$(LIBDIR_U):
-	md $(INSTALLDIR_D)\$(LIBDIR_D)
+	- md $(INSTALLDIR_D)\$(LIBDIR_D)
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform/%.h: include/allegro/platform/%.h $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform
 	copy $(subst /,\,$< $@)
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform: $(INSTALLDIR_U)/$(INCDIR_U)/allegro
-	md $(INSTALLDIR_D)\$(INCDIR_D)\allegro\platform
+	- md $(INSTALLDIR_D)\$(INCDIR_D)\allegro\platform
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/%.h: include/allegro/internal/%.h $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal
 	copy $(subst /,\,$< $@)
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal: $(INSTALLDIR_U)/$(INCDIR_U)/allegro
-	md $(INSTALLDIR_D)\$(INCDIR_D)\allegro\internal
+	- md $(INSTALLDIR_D)\$(INCDIR_D)\allegro\internal
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline/%.inl: include/allegro/inline/%.inl $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline
 	copy $(subst /,\,$< $@)
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline: $(INSTALLDIR_U)/$(INCDIR_U)/allegro
-	md $(INSTALLDIR_D)\$(INCDIR_D)\allegro\inline
+	- md $(INSTALLDIR_D)\$(INCDIR_D)\allegro\inline
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro/%.h: include/allegro/%.h $(INSTALLDIR_U)/$(INCDIR_U)/allegro
 	copy $(subst /,\,$< $@)
 
 $(INSTALLDIR_U)/$(INCDIR_U)/allegro: $(INSTALLDIR_U)/$(INCDIR_U)
-	-md $(INSTALLDIR_D)\$(INCDIR_D)\allegro 
+	- md $(INSTALLDIR_D)\$(INCDIR_D)\allegro 
 # workaround for a weird make problem
 
 $(INSTALLDIR_U)/$(INCDIR_U)/%.h: include/%.h $(INSTALLDIR_U)/$(INCDIR_U)
 	copy $(subst /,\,$< $@)
 
 $(INSTALLDIR_U)/$(INCDIR_U):
-	md $(INSTALLDIR_D)\$(INCDIR_D)
+	- md $(INSTALLDIR_D)\$(INCDIR_D)
 
 endif
 


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/