diff options
| author | Bryan Ischo <bryan@ischo.com> | 2008-08-09 01:46:30 +0000 |
|---|---|---|
| committer | Bryan Ischo <bryan@ischo.com> | 2008-08-09 01:46:30 +0000 |
| commit | e22875d4332c48d83219ecc90e13f3786185f038 (patch) | |
| tree | e908e990c1ba6619bb422385ac37d80e7a161b51 /GNUmakefile | |
| parent | 79ef8b5a3b74147bdd0b8784776363ed183095b1 (diff) | |
| download | ceph-libs3-e22875d4332c48d83219ecc90e13f3786185f038.tar.gz | |
* Fixed bug reported by Troy Hakala <troy.hakala@gmail.com>:
Wasn't using URL-encoded key in request URI, so libs3 failed on keys
with spaces and other unsafe characters
* Updated RPM and DEB packaging to split packages into two: normal and devel
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 091b4e0..969b67f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -130,9 +130,10 @@ uninstall: # Debian package target DEBPKG = $(BUILD)/pkg/libs3_$(LIBS3_VER).deb +DEBDEVPKG = $(BUILD)/pkg/libs3-dev_$(LIBS3_VER).deb .PHONY: deb -deb: $(DEBPKG) +deb: $(DEBPKG) $(DEBDEVPKG) $(DEBPKG): DEBARCH = $(shell dpkg-architecture | grep ^DEB_BUILD_ARCH= | \ cut -d '=' -f 2) @@ -146,6 +147,15 @@ $(DEBPKG): exported $(BUILD)/deb/DEBIAN/control $(BUILD)/deb/DEBIAN/shlibs \ fakeroot dpkg-deb -b $(BUILD)/deb $@ mv $@ $(BUILD)/pkg/libs3_$(LIBS3_VER)_$(DEBARCH).deb +$(DEBDEVPKG): exported $(BUILD)/deb-dev/DEBIAN/control \ + $(BUILD)/deb-dev/usr/share/doc/libs3/changelog.gz \ + $(BUILD)/deb-dev/usr/share/doc/libs3/changelog.Debian.gz \ + $(BUILD)/deb-dev/usr/share/doc/libs3/copyright + DESTDIR=$(BUILD)/deb-dev/usr $(MAKE) install + @mkdir -p $(dir $@) + fakeroot dpkg-deb -b $(BUILD)/deb $@ + mv $@ $(BUILD)/pkg/libs3-dev_$(LIBS3_VER)_$(DEBARCH).deb + $(BUILD)/deb/DEBIAN/control: debian/control @mkdir -p $(dir $@) echo -n "Depends: " > $@ @@ -154,6 +164,13 @@ $(BUILD)/deb/DEBIAN/control: debian/control < $< | sed -e 's/DEBIAN_ARCHITECTURE/$(DEBARCH)/' | \ grep -v ^Source: >> $@ +$(BUILD)/deb-dev/DEBIAN/control: debian/control.dev + @mkdir -p $(dir $@) + echo -n "Depends: " > $@ + dpkg-shlibdeps -O $(BUILD)/bin/s3 | cut -d '=' -f 2- >> $@ + sed -e 's/LIBS3_VERSION/$(LIBS3_VER)/' \ + < $< | sed -e 's/DEBIAN_ARCHITECTURE/$(DEBARCH)/' >> $@ + $(BUILD)/deb/DEBIAN/shlibs: echo -n "libs3 $(LIBS3_VER_MAJOR) libs3 " > $@ echo "(>= $(LIBS3_VER))" >> $@ @@ -170,14 +187,31 @@ $(BUILD)/deb/usr/share/doc/libs3/copyright: LICENSE @echo "License version 3 on Debian" >> $@ @echo "systems is /usr/share/common-licenses/GPL-3." >> $@ +$(BUILD)/deb-dev/usr/share/doc/libs3/copyright: LICENSE + @mkdir -p $(dir $@) + cp $< $@ + @echo >> $@ + @echo -n "An alternate location for the GNU General Public " >> $@ + @echo "License version 3 on Debian" >> $@ + @echo "systems is /usr/share/common-licenses/GPL-3." >> $@ + $(BUILD)/deb/usr/share/doc/libs3/changelog.gz: debian/changelog @mkdir -p $(dir $@) gzip --best -c $< > $@ +$(BUILD)/deb-dev/usr/share/doc/libs3/changelog.gz: debian/changelog + @mkdir -p $(dir $@) + gzip --best -c $< > $@ + $(BUILD)/deb/usr/share/doc/libs3/changelog.Debian.gz: debian/changelog.Debian @mkdir -p $(dir $@) gzip --best -c $< > $@ +$(BUILD)/deb-dev/usr/share/doc/libs3/changelog.Debian.gz: \ + debian/changelog.Debian + @mkdir -p $(dir $@) + gzip --best -c $< > $@ + # -------------------------------------------------------------------------- # Compile target patterns |