something something fixing branches
This commit is contained in:
@@ -26,8 +26,9 @@ FROM farpn-base AS rigctld-builder
|
||||
|
||||
>>>>>>> d078273 (moved dockerfile for rigctld, added config stubs)
|
||||
RUN <<EOF
|
||||
mkdir src
|
||||
cd src
|
||||
git clone https://github.com/Hamlib/Hamlib.git
|
||||
git clone --branch 4.6.5 --single-branch https://github.com/Hamlib/Hamlib.git
|
||||
cd Hamlib
|
||||
<<<<<<< HEAD
|
||||
./bootstrap
|
||||
@@ -37,8 +38,8 @@ EOF
|
||||
|
||||
=======
|
||||
mkdir build; cd build
|
||||
./bootstrap
|
||||
./configure --prefix=/usr/local
|
||||
../bootstrap
|
||||
../configure --prefix=/usr/local
|
||||
make clean
|
||||
make
|
||||
make install
|
||||
|
||||
Reference in New Issue
Block a user