diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7dbbdc1d6e..5662111f22 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,21 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-27 15:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * mpkg_rpm.sh + * mpkg_rpm_wce.sh + * mpkg_rpm_win.sh + - harbour.spec + - harbour-wce.spec + - harbour-win.spec + + package/harbour.spec + + package/harbour-wce.spec + + package/harbour-win.spec + * .spec files moved inside package dir. + + * INSTALL + ! Correction to tgz creation command. + 2010-07-27 13:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) - contrib/hbqt/qtgui/filelist.mk - Deleted no more used make file. diff --git a/harbour/INSTALL b/harbour/INSTALL index 2a9a1c03c9..e900b38c4c 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -219,7 +219,7 @@ HARBOUR --------------------- $ export HB_BUILD_PKG=yes - $ make + $ make clean install Binary .deb on Linux -------------------- diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh index e45d1de3c1..1d95fcbc11 100755 --- a/harbour/mpkg_rpm.sh +++ b/harbour/mpkg_rpm.sh @@ -185,7 +185,7 @@ then if [ "${BUGGY_RPM}" = "yes" ] then cp ${hb_filename} ${RPMDIR}/SOURCES - cp harbour.spec ${RPMDIR}/SPECS + cp package/harbour.spec ${RPMDIR}/SPECS fi if which rpmbuild >/dev/null 2>&1 then diff --git a/harbour/mpkg_rpm_wce.sh b/harbour/mpkg_rpm_wce.sh index 2f7980631f..260cb2de07 100755 --- a/harbour/mpkg_rpm_wce.sh +++ b/harbour/mpkg_rpm_wce.sh @@ -90,7 +90,7 @@ then mv ${hb_filename} ${RPMDIR}/SOURCES/ sed -e "s/^%define version .*$/%define version ${hb_ver}/g" \ -e "s/^%define releasen .*$/%define releasen ${hb_verstat}/g" \ - harbour-wce.spec > ${RPMDIR}/SPECS/harbour-wce.spec + package/harbour-wce.spec > ${RPMDIR}/SPECS/harbour-wce.spec if which rpmbuild >/dev/null 2>&1 then RPMBLD="rpmbuild" diff --git a/harbour/mpkg_rpm_win.sh b/harbour/mpkg_rpm_win.sh index 30acb6b939..088f26a8b2 100755 --- a/harbour/mpkg_rpm_win.sh +++ b/harbour/mpkg_rpm_win.sh @@ -114,7 +114,7 @@ then -e "s|^%define releasen .*$|%define releasen ${hb_verstat}|g" \ -e "s|^%define hb_ccpath .*$|%define hb_ccpath ${HB_CCPATH}|g" \ -e "s|^%define hb_ccpref .*$|%define hb_ccpref ${HB_CCPREFIX}|g" \ - harbour-win.spec > ${RPMDIR}/SPECS/harbour-win.spec + package/harbour-win.spec > ${RPMDIR}/SPECS/harbour-win.spec if which rpmbuild >/dev/null 2>&1 then RPMBLD="rpmbuild" diff --git a/harbour/harbour-wce.spec b/harbour/package/harbour-wce.spec similarity index 100% rename from harbour/harbour-wce.spec rename to harbour/package/harbour-wce.spec diff --git a/harbour/harbour-win.spec b/harbour/package/harbour-win.spec similarity index 100% rename from harbour/harbour-win.spec rename to harbour/package/harbour-win.spec diff --git a/harbour/harbour.spec b/harbour/package/harbour.spec similarity index 100% rename from harbour/harbour.spec rename to harbour/package/harbour.spec