Author: pebender
Date: Mon Nov 17 06:19:09 2008
New Revision: 3974
Modified:
trunk/gar-minimyth/script/X11/vdpau/Makefile
Log:
- Fixed bug that caused X11/vdpau to remove files installed by
nvidia/nvidia-*.
Modified: trunk/gar-minimyth/script/X11/vdpau/Makefile
==============================================================================
--- trunk/gar-minimyth/script/X11/vdpau/Makefile (original)
+++ trunk/gar-minimyth/script/X11/vdpau/Makefile Mon Nov 17 06:19:09 2008
@@ -2,23 +2,56 @@
NVIDIA_MINOR_VERSION = 06
NVIDIA_TEENY_VERSION =
-INSTALL_SCRIPTS = libs includes
+INSTALL_SCRIPTS = includes libs
GAR_EXTRA_CONF += kernel-$(mm_KERNEL_VERSION)/linux/package-api.mk
nvidia/nvidia/package-api.mk
include ../../gar.mk
-NVIDIA_FILE_LIST_BIN =
-NVIDIA_FILE_LIST_LIB_DRV =
-NVIDIA_FILE_LIST_LIB_SO = $(strip \
+NVIDIA_FILE_LIST_LIB_SO = $(strip \
$(if $(wildcard $(WORKSRC)/usr/lib/libvdpau.so.*), \
libvdpau.so:/usr/lib:$(libdir)) \
)
-install-libs: install-nvidia-x11
- @$(MAKECOOKIE)
-
install-includes:
@mkdir -p $(DESTDIR)$(includedir)
@rm -rf $(DESTDIR)$(includedir)/vdpau
@cp -r $(WORKSRC)/usr/include/vdpau $(DESTDIR)$(includedir)
+ @$(MAKECOOKIE)
+
+install-libs:
+ @$(foreach entry,$(NVIDIA_FILE_LIST_LIB_SO), \
+ rm -f \
+ $(DESTDIR)$(word 3,$(subst :, ,$(entry)))/$(word
1,$(subst :, ,$(entry))) \
+ $(DESTDIR)$(word 3,$(subst :, ,$(entry)))/$(word
1,$(subst :, ,$(entry))).* ; \
+ )
+ @$(foreach entry,$(NVIDIA_FILE_LIST_LIB_SO), \
+ install -D \
+ $(WORKSRC)$(word 2,$(subst :, ,$(entry)))/$(word
1,$(subst :, ,$(entry))).$(word 1,$(NVIDIA_VERSION_LIST)) \
+ $(DESTDIR)$(word 3,$(subst :, ,$(entry)))/$(word
1,$(subst :, ,$(entry))).$(word 1,$(NVIDIA_VERSION_LIST)) ; \
+ )
+ @$(foreach entry,$(NVIDIA_FILE_LIST_LIB_SO), $(if $(word
2,$(NVIDIA_VERSION_LIST)), \
+ ln -sf \
+ $(word 1,$(subst :, ,$(entry))).$(word
1,$(NVIDIA_VERSION_LIST)) \
+ $(DESTDIR)$(word 3,$(subst :, ,$(entry)))/$(word
1,$(subst :, ,$(entry))).$(word 2,$(NVIDIA_VERSION_LIST)) ; \
+ ))
+ @$(foreach entry,$(NVIDIA_FILE_LIST_LIB_SO), $(if $(word
3,$(NVIDIA_VERSION_LIST)), \
+ ln -sf \
+ $(word 1,$(subst :, ,$(entry))).$(word
2,$(NVIDIA_VERSION_LIST)) \
+ $(DESTDIR)$(word 3,$(subst :, ,$(entry)))/$(word
1,$(subst :, ,$(entry))).$(word 3,$(NVIDIA_VERSION_LIST)) ; \
+ ))
+ @$(foreach entry,$(NVIDIA_FILE_LIST_LIB_SO), \
+ ln -sf \
+ $(word 1,$(subst :, ,$(entry))).$(word $(words
$(NVIDIA_VERSION_LIST)),$(NVIDIA_VERSION_LIST)) \
+ $(DESTDIR)$(word 3,$(subst :, ,$(entry)))/$(word
1,$(subst :, ,$(entry))) ; \
+ )
+ @$(foreach entry,$(NVIDIA_FILE_LIST_LIB_SO), $(if $(filter-out
1,$(NVIDIA_MAJOR_VERSION)), \
+ ln -sf \
+ $(word 1,$(subst :, ,$(entry))).$(word $(words
$(NVIDIA_VERSION_LIST)),$(NVIDIA_VERSION_LIST)) \
+ $(DESTDIR)$(word 3,$(subst :, ,$(entry)))/$(word
1,$(subst :, ,$(entry))).1 ; \
+ ))
+ @$(foreach entry,$(NVIDIA_FILE_LIST_LIB_SO), $(if $(word
4,$(subst :, ,$(entry))), \
+ ln -sf \
+ $(word 1,$(subst :, ,$(entry))) \
+ $(DESTDIR)$(word 3,$(subst :, ,$(entry)))/$(word
4,$(subst :, ,$(entry))) ; \
+ ))
@$(MAKECOOKIE)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
