Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.1:Test
lsb-buildenv
lsb-buildenv-4.0-destdir-prefix.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File lsb-buildenv-4.0-destdir-prefix.patch of Package lsb-buildenv
--- headers/makefile +++ headers/makefile @@ -42,16 +42,16 @@ install: install-core install-core: core_filelist - install -d $(DESTDIR)/$(INSTALL_ROOT)/$(INCLUDEDIR)/$(SUBDIR) - cpio -pdu $(DESTDIR)/$(INSTALL_ROOT)/$(INCLUDEDIR)/$(SUBDIR) < core_filelist - find $(DESTDIR)/$(INSTALL_ROOT)/$(INCLUDEDIR)/$(SUBDIR) -type d -exec chmod 755 {} \; - xargs md5sum < core_filelist > $(DESTDIR)/$(INSTALL_ROOT)/$(INCLUDEDIR)/$(SUBDIR)/MD5SUMS.core || true + install -d $(DESTDIR)/$(PREFIX)/$(INCLUDEDIR)/$(SUBDIR) + cpio -pdu $(DESTDIR)/$(PREFIX)/$(INCLUDEDIR)/$(SUBDIR) < core_filelist + find $(DESTDIR)/$(PREFIX)/$(INCLUDEDIR)/$(SUBDIR) -type d -exec chmod 755 {} \; + xargs md5sum < core_filelist > $(DESTDIR)/$(PREFIX)/$(INCLUDEDIR)/$(SUBDIR)/MD5SUMS.core || true install-desktop: desktop_filelist - install -d $(DESTDIR)/$(INSTALL_ROOT)/$(INCLUDEDIR)/$(SUBDIR) - cpio -pdu $(DESTDIR)/$(INSTALL_ROOT)/$(INCLUDEDIR)/$(SUBDIR) < desktop_filelist - find $(DESTDIR)/$(INSTALL_ROOT)/$(INCLUDEDIR)/$(SUBDIR) -type d -exec chmod 755 {} \; - xargs md5sum < desktop_filelist > $(DESTDIR)/$(INSTALL_ROOT)/$(INCLUDEDIR)/$(SUBDIR)/MD5SUMS.desktop || true + install -d $(DESTDIR)/$(PREFIX)/$(INCLUDEDIR)/$(SUBDIR) + cpio -pdu $(DESTDIR)/$(PREFIX)/$(INCLUDEDIR)/$(SUBDIR) < desktop_filelist + find $(DESTDIR)/$(PREFIX)/$(INCLUDEDIR)/$(SUBDIR) -type d -exec chmod 755 {} \; + xargs md5sum < desktop_filelist > $(DESTDIR)/$(PREFIX)/$(INCLUDEDIR)/$(SUBDIR)/MD5SUMS.desktop || true clean: --- lsbdev-cc/makefile +++ lsbdev-cc/makefile @@ -41,19 +41,19 @@ g++ $(CXXFLAGS) $(GCC34_COMPAT_CFLAGS) -c $< install: $(PROGRAMS) $(LIBS) $(EXTRA_OBJS) - install -d $(INSTALL_ROOT)/$(BINDIR) - install lsbcc $(INSTALL_ROOT)/$(BINDIR)/lsbcc - install lsbcc $(INSTALL_ROOT)/$(BINDIR)/lsbc++ - install lsbcpp $(INSTALL_ROOT)/$(BINDIR)/lsbcpp - install -d $(INSTALL_ROOT)/$(MANDIR)/man1 - install lsbcc.1 $(INSTALL_ROOT)/$(MANDIR)/man1/lsbcc.1 - install lsbcc.1 $(INSTALL_ROOT)/$(MANDIR)/man1/lsbc++.1 - install lsbcc.1 $(INSTALL_ROOT)/$(MANDIR)/man1/lsbcpp.1 + install -d $(DESTDIR)/$(PREFIX)/$(BINDIR) + install lsbcc $(DESTDIR)/$(PREFIX)/$(BINDIR)/lsbcc + install lsbcc $(DESTDIR)/$(PREFIX)/$(BINDIR)/lsbc++ + install lsbcpp $(DESTDIR)/$(PREFIX)/$(BINDIR)/lsbcpp + install -d $(DESTDIR)/$(PREFIX)/$(MANDIR)/man1 + install lsbcc.1 $(DESTDIR)/$(PREFIX)/$(MANDIR)/man1/lsbcc.1 + install lsbcc.1 $(DESTDIR)/$(PREFIX)/$(MANDIR)/man1/lsbc++.1 + install lsbcc.1 $(DESTDIR)/$(PREFIX)/$(MANDIR)/man1/lsbcpp.1 for version in $(LSB_VERSIONS); do \ install -D libgcc34compat.a \ - $(INSTALL_ROOT)/$(LIBDIR)-$$version/libgcc34compat.a; \ + $(DESTDIR)/$(PREFIX)/$(LIBDIR)-$$version/libgcc34compat.a; \ install -D besteffort.o \ - $(INSTALL_ROOT)/$(LIBDIR)-$$version/besteffort.o; \ + $(DESTDIR)/$(PREFIX)/$(LIBDIR)-$$version/besteffort.o; \ done scripts: --- lsbdev-chroot/Makefile +++ lsbdev-chroot/Makefile @@ -1,5 +1,5 @@ -OVERRIDE_ROOT= -INSTALL_ROOT=/usr/local +DESTDIR= +PREFIX=/usr/local CHROOT_DATA_DIR=/var/lib/lsbdev-chroot CHROOT_ROOT=/var/lib/lsbdev-chroot/root @@ -13,22 +13,22 @@ config/lsbdev.conf.template > config/lsbdev.conf lsbdev: lsbdev.template - @sed -e 's,^PATH=,PATH=${INSTALL_ROOT}/sbin:$$PATH,' \ + @sed -e 's,^PATH=,PATH=${PREFIX}/sbin:$$PATH,' \ lsbdev.template > lsbdev install: configure - mkdir -p ${OVERRIDE_ROOT}/etc/init.d - install lsbdev ${OVERRIDE_ROOT}/etc/init.d/lsbdev-chroot - mkdir -p ${OVERRIDE_ROOT}/${INSTALL_ROOT}/sbin - install lsb_start_dev_env lsb_stop_dev_env ${OVERRIDE_ROOT}/${INSTALL_ROOT}/sbin - mkdir -p ${OVERRIDE_ROOT}/etc/lsbdev-chroot + mkdir -p ${DESTDIR}/etc/init.d + install lsbdev ${DESTDIR}/etc/init.d/lsbdev-chroot + mkdir -p ${DESTDIR}/${PREFIX}/sbin + install lsb_start_dev_env lsb_stop_dev_env ${DESTDIR}/${PREFIX}/sbin + mkdir -p ${DESTDIR}/etc/lsbdev-chroot install -m 644 config/gcc_specs \ config/extra_mount_dirs.conf config/extra_mount_files.conf \ config/libc_script \ - ${OVERRIDE_ROOT}/etc/lsbdev-chroot + ${DESTDIR}/etc/lsbdev-chroot install -m 644 config/lsbdev.conf \ - ${OVERRIDE_ROOT}/etc/lsbdev-chroot/lsbdev-chroot.conf - mkdir -p ${OVERRIDE_ROOT}/${CHROOT_DATA_DIR} + ${DESTDIR}/etc/lsbdev-chroot/lsbdev-chroot.conf + mkdir -p ${DESTDIR}/${CHROOT_DATA_DIR} clean: rm -f config/lsbdev.conf lsbdev --- lsbdev-runner/makefile +++ lsbdev-runner/makefile @@ -7,7 +7,7 @@ rm -f lsbrun.o lsbrun install: lsbrun - install -d $(INSTALL_ROOT)/$(BINDIR) - install lsbrun $(INSTALL_ROOT)/$(BINDIR)/lsbrun + install -d $(DESTDIR)/$(PREFIX)/$(BINDIR) + install lsbrun $(DESTDIR)/$(PREFIX)/$(BINDIR)/lsbrun .PHONY: install clean --- stub_libs/Makefile.all-arch +++ stub_libs/Makefile.all-arch @@ -12,8 +12,8 @@ DESKTOP_SOFILES = $(addsuffix .so,$(DESKTOP_STUBLIBS)) CFLAGS=-g -Wall -fno-builtin -fPIC -INSTALL_DIR=$(INSTALL_ROOT)$(LIBDIR)-$(LSB_VERSION)/$(SUBDIR) -SYMLINK_DIR=$(INSTALL_ROOT)$(LIBDIR) +INSTALL_DIR=$(PREFIX)$(LIBDIR)-$(LSB_VERSION)/$(SUBDIR) +SYMLINK_DIR=$(PREFIX)$(LIBDIR) # For ppc64 platform add flag to generate 64-bit shared libs ifeq ($(shell arch),ppc64) @@ -47,19 +47,19 @@ install $(CORE_SOFILES) $(DESTDIR)/$(INSTALL_DIR) mv $(DESTDIR)/$(INSTALL_DIR)/libstdcxx.so $(DESTDIR)/$(INSTALL_DIR)/libstdc++.so # Create symlink to libs in the most recent LSB version. - cd $(DESTDIR)/$(INSTALL_ROOT) && rm -f ./$(LIBDIR) && ln -s ./$(LIBDIR)-$(LSB_VERSION) ./$(LIBDIR) + cd $(DESTDIR)/$(PREFIX) && rm -f ./$(LIBDIR) && ln -s ./$(LIBDIR)-$(LSB_VERSION) ./$(LIBDIR) install-desktop: install -d $(DESTDIR)/$(INSTALL_DIR) install -d $(DESTDIR)/$(INSTALL_DIR)/pkgconfig - install -d $(DESTDIR)/$(INSTALL_ROOT)/bin + install -d $(DESTDIR)/$(PREFIX)/bin install $(DESKTOP_SOFILES) $(DESTDIR)/$(INSTALL_DIR) # need to handle relocations of the pkgconfig and freetype-config files - sed -i 's|/opt/lsb/include|$(INSTALL_ROOT)$(INCLUDEDIR)/$(SUBDIR)|g' ../../pkgconfig$(LIB64)/*.pc + sed -i 's|/opt/lsb/include|$(PREFIX)$(INCLUDEDIR)/$(SUBDIR)|g' ../../pkgconfig$(LIB64)/*.pc sed -i 's|/opt/lsb/lib.*|$(INSTALL_DIR)|g' ../../pkgconfig$(LIB64)/*.pc - sed -i 's|/opt/lsb|$(INSTALL_ROOT)|g' ../../pkgconfig$(LIB64)/*.pc + sed -i 's|/opt/lsb|$(PREFIX)|g' ../../pkgconfig$(LIB64)/*.pc sed -i 's|/opt/lsb/lib.*|$(INSTALL_DIR)|g' ../../bin$(LIB64)/* - sed -i 's|/opt/lsb|$(INSTALL_ROOT)|g' ../../bin$(LIB64)/* + sed -i 's|/opt/lsb|$(PREFIX)|g' ../../bin$(LIB64)/* install ../../pkgconfig$(LIB64)/*.pc $(DESTDIR)/$(INSTALL_DIR)/pkgconfig - install ../../bin$(LIB64)/freetype-config $(DESTDIR)/$(INSTALL_ROOT)/bin + install ../../bin$(LIB64)/freetype-config $(DESTDIR)/$(PREFIX)/bin
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
