Attachment 114595 Details for Bug 156269 – allegro-gmake-fix.diff

[patch] allegro-gmake-fix.diff

allegro-gmake-fix.diff (text/plain), 4.60 KB, created by Chris Rees on 2011-04-08 07:10:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Rees

Created: 2011-04-08 07:10:12 UTC

Size: 4.60 KB

patch

obsolete

>Index: files/patch-makefile.all
>===================================================================
>RCS file: files/patch-makefile.all
>diff -N files/patch-makefile.all
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-makefile.all	7 Apr 2011 19:30:43 -0000
>@@ -0,0 +1,91 @@
>+--- makefile.all.orig	2011-04-07 20:16:34.097600083 +0100
>++++ makefile.all	2011-04-07 20:18:07.399413945 +0100
>+@@ -234,42 +234,6 @@
>+ 
>+ # -------- rules for deleting the generated files --------
>+ 
>+-clean:
>+-ifdef UNIX_TOOLS
>+-	-rm $(RM_OPTS) $(OBJ_CLEAN_FILES)
>+-	-rm $(RM_OPTS) $(OTHER_CLEAN_FILES)
>+-else
>+-   define RM_CLEAN
>+-      $(foreach file, $(wildcard $(OBJ_CLEAN_FILES)), -del $(subst /,\,$(file))
>+-      )
>+-      $(foreach file, $(wildcard $(OTHER_CLEAN_FILES)), -del $(subst /,\,$(file))
>+-      )
>+-   endef
>+-	-$(RM_CLEAN)
>+-endif
>+-
>+-distclean: clean
>+-ifdef UNIX_TOOLS
>+-	-rm $(RM_OPTS) $(DISTCLEAN_FILES)
>+-else
>+-   define RM_DISTCLEAN
>+-      $(foreach file, $(wildcard $(DISTCLEAN_FILES)), -del $(subst /,\,$(file))
>+-      )
>+-   endef
>+-	-$(RM_DISTCLEAN)
>+-endif
>+-
>+-veryclean: distclean
>+-ifdef UNIX_TOOLS
>+-	-rm $(RM_OPTS) $(VERYCLEAN_FILES)
>+-else
>+-   define RM_VERYCLEAN
>+-      $(foreach file, $(wildcard $(VERYCLEAN_FILES)), -del $(subst /,\,$(file))
>+-      )
>+-   endef
>+-	-$(RM_VERYCLEAN)
>+-endif
>+-
>+ 
>+ 
>+ # -------- rules for installing and removing the generic library files --------
>+@@ -292,15 +256,15 @@
>+    INSTALL_DIRS := $(subst /,$(strip \),$(INSTALL_DIRS))
>+ endif
>+ 
>++define MKDIRS
>++$(foreach dir,$(INSTALL_DIRS),\
>++   misc\mdhelper.bat $(dir)
>++)
>++endef
>+ create-install-dirs:
>+ ifdef UNIX_TOOLS
>+ 	misc/mdhelper.sh $(INSTALL_DIRS)
>+ else
>+-   define MKDIRS
>+-   $(foreach dir,$(INSTALL_DIRS),\
>+-      misc\mdhelper.bat $(dir)
>+-   )
>+-   endef
>+ 	$(MKDIRS)
>+ endif
>+ 
>+@@ -378,24 +342,6 @@
>+         $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/*.h \
>+     )
>+ 
>+-generic-uninstall:
>+-ifdef UNIX_TOOLS
>+-	-rm -fv $(UNINSTALL_FILES)
>+-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform
>+-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline
>+-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal
>+-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro
>+-else
>+-   define RM_FILES
>+-      $(foreach file, $(UNINSTALL_FILES), del $(subst /,\,$(file))
>+-      )
>+-   endef
>+-	-$(RM_FILES)
>+-	-rd $(INSTALLDIR_D)\$(INCDIR_D)\allegro\platform
>+-	-rd $(INSTALLDIR_D)\$(INCDIR_D)\allegro\inline
>+-	-rd $(INSTALLDIR_D)\$(INCDIR_D)\allegro\internal
>+-	-rd $(INSTALLDIR_D)\$(INCDIR_D)\allegro
>+-endif
>+ 
>+ 
>+ 
>Index: files/patch-makefile.in
>===================================================================
>RCS file: /exports/cvsroot-freebsd/ports/devel/allegro/files/patch-makefile.in,v
>retrieving revision 1.11
>diff -u -r1.11 patch-makefile.in
>--- files/patch-makefile.in	24 Jul 2007 13:54:46 -0000	1.11
>+++ files/patch-makefile.in	7 Apr 2011 19:30:43 -0000
>@@ -1,5 +1,5 @@
>---- makefile.in.orig	Fri Jun 15 22:52:28 2007
>-+++ makefile.in	Fri Jul 13 14:52:12 2007
>+--- allegro/work/allegro-4.2.2/makefile.in	2007-07-22 06:55:54.000000000 +0100
>++++ makefile.in	2011-04-07 20:22:50.674897734 +0100
> @@ -29,11 +29,12 @@
>  INFO_DIR = $(infodir)/dir
>  DESTDIR =
>@@ -15,7 +15,7 @@
>  INSTALL_DATA = @INSTALL_DATA@
>  INSTALL_INFO = @INSTALL_INFO@
>  
>-@@ -352,6 +353,11 @@
>+@@ -353,6 +354,11 @@
>  endif
>  
>  lib: $(ALLEGRO_LIB_TARGETS)
>@@ -27,7 +27,53 @@
>  
>  modules: $(ALLEGRO_MODULE_TARGETS)
>  
>-@@ -463,9 +469,9 @@
>+@@ -398,45 +404,6 @@
>+ 
>+ # -------- rules for deleting the generated files --------
>+ 
>+-clean:
>+-
>+-   define RM_OBJ_CLEAN_FILES
>+-      $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file)
>+-      )
>+-   endef
>+-
>+-   define RM_OTHER_CLEAN_FILES
>+-      $(foreach file, $(OTHER_CLEAN_FILES), rm -f $(file)
>+-      )
>+-   endef
>+-
>+-	$(RM_OBJ_CLEAN_FILES)
>+-	$(RM_OTHER_CLEAN_FILES)
>+-
>+-distclean: clean
>+-
>+-   define RM_DISTCLEAN_FILES
>+-      $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file)
>+-      )
>+-   endef
>+-
>+-	$(RM_DISTCLEAN_FILES)
>+-
>+-veryclean: distclean
>+-
>+-   define RM_VERYCLEAN_FILES
>+-      $(foreach file, $(VERYCLEAN_FILES), rm -f $(file)
>+-      )
>+-   endef
>+-
>+-	$(RM_VERYCLEAN_FILES)
>+-	rm -f makefile
>+-
>+-maintainer-clean: veryclean
>+-	rm -f configure include/allegro/platform/alunixac.hin
>+-	rm -rf autom4te*
>+-
>+-
>+ 
>+ # -------- rules for installing the files --------
>+ 
>+@@ -464,9 +431,9 @@
>  	  fi; \
>  	done
>  	@for l in alleg alld allp; do \
>@@ -40,7 +86,7 @@
>  	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
>  	  fi; \
>  	done
>-@@ -479,20 +485,10 @@
>+@@ -480,20 +447,10 @@
>  	fi
>  	$(mkinstalldirs) $(DESTDIR)$(bindir)
>  	@echo Installing allegro-config to $(DESTDIR)$(bindir)

Actions: View | Diff

Attachments on bug 156269: 114595